From 726c5a0359e2a0f831ee50332b1c91b7e4627037 Mon Sep 17 00:00:00 2001
From: Madhavan Sridharan <madhavan.sridharan@datastax.com>
Date: Thu, 12 Sep 2024 16:49:23 -0400
Subject: [PATCH] Switch to using C* 5.0 for testing & include vectors

---
 RELEASE.md                                                    | 4 ++++
 SIT/cdm-assert.sh                                             | 1 +
 SIT/environment.sh                                            | 2 +-
 .../06_vector/cdm.migrateData.assert                          | 0
 SIT/{smoke_inflight => smoke}/06_vector/cdm.txt               | 0
 .../06_vector/cdm.validateData.assert                         | 1 +
 SIT/{smoke_inflight => smoke}/06_vector/execute.sh            | 0
 SIT/{smoke_inflight => smoke}/06_vector/expected.cql          | 0
 SIT/{smoke_inflight => smoke}/06_vector/expected.out          | 0
 SIT/{smoke_inflight => smoke}/06_vector/migrate.properties    | 0
 SIT/{smoke_inflight => smoke}/06_vector/setup.cql             | 0
 SIT/test.sh                                                   | 2 +-
 12 files changed, 8 insertions(+), 2 deletions(-)
 rename SIT/{smoke_inflight => smoke}/06_vector/cdm.migrateData.assert (100%)
 rename SIT/{smoke_inflight => smoke}/06_vector/cdm.txt (100%)
 rename SIT/{smoke_inflight => smoke}/06_vector/cdm.validateData.assert (89%)
 rename SIT/{smoke_inflight => smoke}/06_vector/execute.sh (100%)
 rename SIT/{smoke_inflight => smoke}/06_vector/expected.cql (100%)
 rename SIT/{smoke_inflight => smoke}/06_vector/expected.out (100%)
 rename SIT/{smoke_inflight => smoke}/06_vector/migrate.properties (100%)
 rename SIT/{smoke_inflight => smoke}/06_vector/setup.cql (100%)

diff --git a/RELEASE.md b/RELEASE.md
index 74e10506..70bad5b3 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -1,4 +1,8 @@
 # Release Notes
+## [4.3.11] - 2024-TBD
+- Switched to using Apache Cassandra® `5.0` docker image for testing
+- Introduces smoke testing of `vector` CQL data type
+
 ## [4.3.10] - 2024-09-12
 - Added property `spark.cdm.trackRun.runId` to support a custom unique identifier for the current run. This can be used by wrapper scripts to pass a known `runId` and then use it to query the `cdm_run_info` and `cdm_run_details` tables.
 
diff --git a/SIT/cdm-assert.sh b/SIT/cdm-assert.sh
index 8d79b873..309a9a96 100755
--- a/SIT/cdm-assert.sh
+++ b/SIT/cdm-assert.sh
@@ -29,6 +29,7 @@ Missing Record Count: 0
 Corrected Missing Record Count: 0
 Valid Record Count: 3
 Skipped Record Count: 0
+Error Record Count: 0
 ---------------
 
 EOF
diff --git a/SIT/environment.sh b/SIT/environment.sh
index 21c31517..cc7cff5d 100755
--- a/SIT/environment.sh
+++ b/SIT/environment.sh
@@ -68,7 +68,7 @@ fi
 ###
 # These variables are hard-coded for now
 SUBNET=$(echo ${CIDR} | cut -d. -f1-3)
-CASS_VERSION=4
+CASS_VERSION=5.0
 CDM_VERSION=latest
 #==============================================================================================================================
 # Helper Functions
diff --git a/SIT/smoke_inflight/06_vector/cdm.migrateData.assert b/SIT/smoke/06_vector/cdm.migrateData.assert
similarity index 100%
rename from SIT/smoke_inflight/06_vector/cdm.migrateData.assert
rename to SIT/smoke/06_vector/cdm.migrateData.assert
diff --git a/SIT/smoke_inflight/06_vector/cdm.txt b/SIT/smoke/06_vector/cdm.txt
similarity index 100%
rename from SIT/smoke_inflight/06_vector/cdm.txt
rename to SIT/smoke/06_vector/cdm.txt
diff --git a/SIT/smoke_inflight/06_vector/cdm.validateData.assert b/SIT/smoke/06_vector/cdm.validateData.assert
similarity index 89%
rename from SIT/smoke_inflight/06_vector/cdm.validateData.assert
rename to SIT/smoke/06_vector/cdm.validateData.assert
index 0340bf26..6edc8c4d 100644
--- a/SIT/smoke_inflight/06_vector/cdm.validateData.assert
+++ b/SIT/smoke/06_vector/cdm.validateData.assert
@@ -5,3 +5,4 @@ Missing Record Count: 0
 Corrected Missing Record Count: 0
 Valid Record Count: 2
 Skipped Record Count: 0
+Error Record Count: 0
diff --git a/SIT/smoke_inflight/06_vector/execute.sh b/SIT/smoke/06_vector/execute.sh
similarity index 100%
rename from SIT/smoke_inflight/06_vector/execute.sh
rename to SIT/smoke/06_vector/execute.sh
diff --git a/SIT/smoke_inflight/06_vector/expected.cql b/SIT/smoke/06_vector/expected.cql
similarity index 100%
rename from SIT/smoke_inflight/06_vector/expected.cql
rename to SIT/smoke/06_vector/expected.cql
diff --git a/SIT/smoke_inflight/06_vector/expected.out b/SIT/smoke/06_vector/expected.out
similarity index 100%
rename from SIT/smoke_inflight/06_vector/expected.out
rename to SIT/smoke/06_vector/expected.out
diff --git a/SIT/smoke_inflight/06_vector/migrate.properties b/SIT/smoke/06_vector/migrate.properties
similarity index 100%
rename from SIT/smoke_inflight/06_vector/migrate.properties
rename to SIT/smoke/06_vector/migrate.properties
diff --git a/SIT/smoke_inflight/06_vector/setup.cql b/SIT/smoke/06_vector/setup.cql
similarity index 100%
rename from SIT/smoke_inflight/06_vector/setup.cql
rename to SIT/smoke/06_vector/setup.cql
diff --git a/SIT/test.sh b/SIT/test.sh
index b2c91925..9dede74e 100755
--- a/SIT/test.sh
+++ b/SIT/test.sh
@@ -6,7 +6,7 @@ _usage() {
 usage: $0 -p phase 
 
 Required
-  -p phase: one of {$PHASES}
+  -p phase: one of ${PHASES}
 
 EOF
 exit 1