address review

Author: martinrupp

pipelines/upgrade-testing/check_upgrade.sh

@@ -1,54 +1,68 @@
 #!/bin/bash
-
 UPGRADE_URL=s3://splice-snapshots/upgrade_tests
 
-VERSION=${1} # e.g. 3.1.0.1971
-shift 1
-
-PREVIOUS_BRANCH=`git rev-parse --abbrev-ref HEAD`
-git stash
-
-# creates a file platform_it_${VERSION}.tar.gz
-git checkout tags/${VERSION}
-cd platform_it
-rm -rf target *.log snappy*.jnilib
-cd ..
-
-./start-splice-cluster $*
-./start-splice-cluster -k
-
-rm -rf upgrade_test_TMP
-mkdir -p upgrade_test_TMP/platform_it/target
-cd upgrade_test_TMP
-cp -r ../platform_it/target/hbase platform_it/target/.
-cp -r ../platform_it/target/zookeeper platform_it/target/.
-tar -czvf ../platform_it_${VERSION}.tar.gz platform_it
-cd ..
-rm -rf upgrade_test_TMP
-
-git checkout ${PREVIOUS_BRANCH}
-git stash pop
-
-# restart on that version
-./start-splice-cluster $*
-
-# clean up platform_it
-cd platform_it
-git clean -dfx
-cd ..
-
-# download the previous standalone data
-tar -xzvf platform_it_${VERSION}.tar.gz
-rm platform_it_${VERSION}.tar.gz
-
-# restart cluster
-./start-splice-cluster -l $*
-
-# test
-if mvn -B -e surefire:test -Pcore,cdh6.3.0 -Dtest='UpgradeTestIT#*' -DskipServerStart -DfailIfNoTests=false; then
-    echo "UPGRADE SUCCEEDED"
-    cat platform_it/splice.log | grep 'upgrade scripts'
-    cat platform_it/splice.log | grep 'Running upgrade script'	
-else
-	echo "!!! UPGRADE FAILED !!!"
+if [ $# -lt 2 ]
+then
+	echo "usage: bash check_upgrade.sh {VERSION} {additional start-splice-cluster parameters}"
+	echo "------------------------------------------------------------------------------------------"
+	echo "uses a previously created tar.gz to test upgrade"
+	echo "e.g. bash check_upgrade.sh 3.2.2021"
+    
+    exit 1
 fi
+
+function test_upgrade
+{
+	OLDVERSION=$1
+	echo ""
+	echo "                        testing $OLDVERSION upgrade"
+	echo "--------------------------------------------------------------------------------"
+    echo ""
+
+	UPGRADE_URL=s3://splice-snapshots/upgrade_tests
+    
+    # stop current cluster
+    ./start-splice-cluster -k
+    
+    # clean up platform_it
+    cd platform_it
+    git clean -dfx
+    cd ..
+
+	echo ""
+  	echo "   download ${UPGRADE_URL}/platform_it_${OLDVERSION}.tar.gz"
+	echo "--------------------------------------------------------------------------------"
+    echo ""
+	# download the previous standalone data
+	aws s3 cp ${UPGRADE_URL}/platform_it_${OLDVERSION}.tar.gz .
+	tar -xzf platform_it_${OLDVERSION}.tar.gz
+    rm platform_it_${OLDVERSION}.tar.gz
+
+	echo ""
+  	echo "	./start-splice-cluster -l $*"
+	echo "--------------------------------------------------------------------------------"
+    echo ""
+    
+	# restart cluster
+	./start-splice-cluster -l $*
+	
+	# test
+	if mvn -B -e surefire:test -Pcore,cdh6.3.0 \
+    	-Dtest='UpgradeTestIT#*' -DskipServerStart \
+        -DfailIfNoTests=false; \
+        -Dmaven.test.redirectTestOutputToFile=true
+   then
+	    echo "UPGRADE SUCCEEDED"
+	    cat platform_it/splice.log | grep 'upgrade scripts'
+	    cat platform_it/splice.log | grep 'Running upgrade script'	
+	else
+		echo "!!! UPGRADE FAILED !!!"
+		exit 2
+	fi
+
+	echo "--------------------------------------------------------------------------------"
+    echo ""
+}
+
+
+test_upgrade $*

pipelines/upgrade-testing/check_upgrade_fast.sh

@@ -5,18 +5,17 @@ UPGRADE_URL=s3://splice-snapshots/upgrade_tests
 
 if [ $# -lt 2 ]
 then
-    echo "usage: bash platform_it/src/test/bin/create_upgrade_targz.sh {VERSION} {test/upload} {additional start-splice-cluster parameters}"
+    echo "usage: bash pipelines/upgrade-testing/create_upgrade_targz.sh {VERSION} {test/upload} {additional start-splice-cluster parameters}"
     echo "----------------------------------------------------------------------------------------------------------------------------------"
     echo "creates a tar.gz of a spliceengine standalone cluster that can be used to test upgrade"
-    echo "e.g. bash create_upgrade_targz.sh 3.1.0.1971 test -T 16 -pcore,cdh6.3.0"
+    echo "e.g. bash create_upgrade_targz.sh 3.1.0.1971 test -pcore,cdh6.3.0"
     exit 1
 fi
 
 VERSION=${1} # e.g. 3.1.0.1971
 MODE=${2} # test or upload
 shift 2
 
-
 PREVIOUS_BRANCH=`git rev-parse --abbrev-ref HEAD`
 git stash
 

pipelines/upgrade-testing/create_upgrade_targz.sh

@@ -1,3 +1,5 @@
+# JENKINS FILE USED FOR UPGRADE-TESTING
+
 #!/bin/bash
 
 export platform=${ghprbCommentBody##*@}