From 540fe21311fadbf5a2c52393b136807401fb3ac6 Mon Sep 17 00:00:00 2001 From: Ritu Deshmukh Date: Tue, 9 May 2023 13:35:47 +0530 Subject: [PATCH 1/9] Updating the oudated release script Signed-off-by: Ritu Deshmukh --- scripts/release-bit-verification.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/scripts/release-bit-verification.sh b/scripts/release-bit-verification.sh index 7f6960e6da4..8f9f2d6f6be 100755 --- a/scripts/release-bit-verification.sh +++ b/scripts/release-bit-verification.sh @@ -17,6 +17,10 @@ shout() { } # Check SHASUM for all the binary files and there should be no difference +#For erroring out in case of error +set -euo pipefail +IFS=$'\n\t' + # Create a Temp directory WORKING_DIR=$(mktemp -d) shout "WORKING_DIR=$WORKING_DIR" @@ -67,10 +71,9 @@ fi git clone $REPO_URL odo && cd $WORKING_DIR/odo && git checkout "v$VERSION" #Run tests -make test-integration-devfile -make test-integration -make test-e2e-all -make test-cmd-project +make test-e2e # Cleanup rm -rf /tmp/odo /tmp/usr + + From d888170cba603eb67529ff424f8f256de6e5c4b8 Mon Sep 17 00:00:00 2001 From: ritudes <122885572+ritudes@users.noreply.github.com> Date: Wed, 10 May 2023 17:26:56 +0530 Subject: [PATCH 2/9] Update release-bit-verification.sh --- scripts/release-bit-verification.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/release-bit-verification.sh b/scripts/release-bit-verification.sh index 8f9f2d6f6be..37ba52eb66f 100755 --- a/scripts/release-bit-verification.sh +++ b/scripts/release-bit-verification.sh @@ -18,8 +18,7 @@ shout() { # Check SHASUM for all the binary files and there should be no difference #For erroring out in case of error -set -euo pipefail -IFS=$'\n\t' +set -e # Create a Temp directory WORKING_DIR=$(mktemp -d) From 7685b7c1b074de1c73ab4856af8e74bde745c1a5 Mon Sep 17 00:00:00 2001 From: ritudes <122885572+ritudes@users.noreply.github.com> Date: Thu, 11 May 2023 11:58:20 +0530 Subject: [PATCH 3/9] Update scripts/release-bit-verification.sh Co-authored-by: Armel Soro --- scripts/release-bit-verification.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/release-bit-verification.sh b/scripts/release-bit-verification.sh index 37ba52eb66f..137713b007e 100755 --- a/scripts/release-bit-verification.sh +++ b/scripts/release-bit-verification.sh @@ -18,7 +18,7 @@ shout() { # Check SHASUM for all the binary files and there should be no difference #For erroring out in case of error -set -e +set -eo pipefail # Create a Temp directory WORKING_DIR=$(mktemp -d) From 65cb1953d572879d0e8f3c4c836f8a54ab2bd617 Mon Sep 17 00:00:00 2001 From: ritudes <122885572+ritudes@users.noreply.github.com> Date: Thu, 11 May 2023 11:58:34 +0530 Subject: [PATCH 4/9] Update scripts/release-bit-verification.sh Co-authored-by: Armel Soro --- scripts/release-bit-verification.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/release-bit-verification.sh b/scripts/release-bit-verification.sh index 137713b007e..76657c97e4f 100755 --- a/scripts/release-bit-verification.sh +++ b/scripts/release-bit-verification.sh @@ -73,6 +73,6 @@ git clone $REPO_URL odo && cd $WORKING_DIR/odo && git checkout "v$VERSION" make test-e2e # Cleanup -rm -rf /tmp/odo /tmp/usr +rm -rf "$WORKING_DIR" From 94bf88e900aa5055a1f5588b017058badd075d74 Mon Sep 17 00:00:00 2001 From: ritudes <122885572+ritudes@users.noreply.github.com> Date: Mon, 15 May 2023 11:24:16 +0530 Subject: [PATCH 5/9] Update release-bit-verification.sh --- scripts/release-bit-verification.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/release-bit-verification.sh b/scripts/release-bit-verification.sh index 76657c97e4f..ba8bcef20c3 100755 --- a/scripts/release-bit-verification.sh +++ b/scripts/release-bit-verification.sh @@ -11,14 +11,15 @@ # # Example: ./release-bit-verification.sh ~/Downloads/odo-redistributable-2.4.3-1.el8.x86_64.rpm # +#For erroring out in case of error +set -eo pipefail shout() { echo "--------------------------------$1------------------------------------------" } # Check SHASUM for all the binary files and there should be no difference -#For erroring out in case of error -set -eo pipefail + # Create a Temp directory WORKING_DIR=$(mktemp -d) From 8cc945600904f547cf8c45fed1c5347960628d1b Mon Sep 17 00:00:00 2001 From: ritudes <122885572+ritudes@users.noreply.github.com> Date: Tue, 23 May 2023 12:48:00 +0530 Subject: [PATCH 6/9] Update release-bit-verification.sh --- scripts/release-bit-verification.sh | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/scripts/release-bit-verification.sh b/scripts/release-bit-verification.sh index ba8bcef20c3..34ebdf14e39 100755 --- a/scripts/release-bit-verification.sh +++ b/scripts/release-bit-verification.sh @@ -22,9 +22,21 @@ shout() { # Create a Temp directory +if [ "$#" -lt 1 ] +then + echo "No arguments supplied" + exit 1 +fi + WORKING_DIR=$(mktemp -d) -shout "WORKING_DIR=$WORKING_DIR" -export REPO_URL=${REPO_URL:-"https://github.com/redhat-developer/odo.git"} +if [ -f ${1} ]; +then + shout "WORKING_DIR=$WORKING_DIR" + export REPO_URL=${REPO_URL:-"https://github.com/redhat-developer/odo.git"} +else + echo "Please enter a valid filepath"; + exit 1 +fi # Extract from rpm file rpm2cpio ${1} | cpio -idmvD $WORKING_DIR From 04cfbc05e2394ba6b7324cc568767639793fd12e Mon Sep 17 00:00:00 2001 From: ritudes <122885572+ritudes@users.noreply.github.com> Date: Tue, 23 May 2023 14:55:21 +0530 Subject: [PATCH 7/9] Update release-bit-verification.sh --- scripts/release-bit-verification.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/release-bit-verification.sh b/scripts/release-bit-verification.sh index 34ebdf14e39..7a8197782f3 100755 --- a/scripts/release-bit-verification.sh +++ b/scripts/release-bit-verification.sh @@ -28,9 +28,9 @@ then exit 1 fi -WORKING_DIR=$(mktemp -d) if [ -f ${1} ]; then + WORKING_DIR=$(mktemp -d) shout "WORKING_DIR=$WORKING_DIR" export REPO_URL=${REPO_URL:-"https://github.com/redhat-developer/odo.git"} else From 42b59cdbcc1761a6462ea6ecd274162e072059e1 Mon Sep 17 00:00:00 2001 From: ritudes <122885572+ritudes@users.noreply.github.com> Date: Tue, 23 May 2023 15:46:27 +0530 Subject: [PATCH 8/9] Update release-bit-verification.sh --- scripts/release-bit-verification.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/release-bit-verification.sh b/scripts/release-bit-verification.sh index 7a8197782f3..6261adedc62 100755 --- a/scripts/release-bit-verification.sh +++ b/scripts/release-bit-verification.sh @@ -28,14 +28,14 @@ then exit 1 fi -if [ -f ${1} ]; +if [ ! -f ${1} ]; then + echo "Please enter a valid filepath"; + exit 1 +else WORKING_DIR=$(mktemp -d) shout "WORKING_DIR=$WORKING_DIR" export REPO_URL=${REPO_URL:-"https://github.com/redhat-developer/odo.git"} -else - echo "Please enter a valid filepath"; - exit 1 fi # Extract from rpm file From 508e049cf10419c3280ca2d1acfd1679d013b1be Mon Sep 17 00:00:00 2001 From: ritudes <122885572+ritudes@users.noreply.github.com> Date: Tue, 23 May 2023 15:50:05 +0530 Subject: [PATCH 9/9] Update release-bit-verification.sh --- scripts/release-bit-verification.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/release-bit-verification.sh b/scripts/release-bit-verification.sh index 6261adedc62..c7fb7fc9510 100755 --- a/scripts/release-bit-verification.sh +++ b/scripts/release-bit-verification.sh @@ -21,7 +21,7 @@ shout() { -# Create a Temp directory +# Checking for no or invaild arguments if [ "$#" -lt 1 ] then echo "No arguments supplied" @@ -32,11 +32,12 @@ if [ ! -f ${1} ]; then echo "Please enter a valid filepath"; exit 1 -else - WORKING_DIR=$(mktemp -d) - shout "WORKING_DIR=$WORKING_DIR" - export REPO_URL=${REPO_URL:-"https://github.com/redhat-developer/odo.git"} fi +#Creating an Temp directory +WORKING_DIR=$(mktemp -d) +shout "WORKING_DIR=$WORKING_DIR" +export REPO_URL=${REPO_URL:-"https://github.com/redhat-developer/odo.git"} + # Extract from rpm file rpm2cpio ${1} | cpio -idmvD $WORKING_DIR