update release scripts for new hosts, and CI to run more tests (#7480)

* update daily CI to include cluster and sentinel tests
* update daily CI to run when creating a new release
* update release scripts to work on the new redis.io hosts

4 files changed, 45 insertions, 23 deletions

diff --git a/utils/releasetools/01_create_tarball.sh b/utils/releasetools/01_create_tarball.sh
index 54bca8c04..366a61e2c 100755
--- a/utils/releasetools/01_create_tarball.sh
+++ b/utils/releasetools/01_create_tarball.sh
@@ -1,14 +1,13 @@
 #!/bin/sh
 if [ $# != "1" ]
 then
-    echo "Usage: ./mkrelease.sh <git-ref>"
+    echo "Usage: ./utils/releasetools/01_create_tarball.sh <version_tag>"
     exit 1
 fi
 
 TAG=$1
 TARNAME="redis-${TAG}.tar"
 echo "Generating /tmp/${TARNAME}"
-cd ~/hack/redis
 git archive $TAG --prefix redis-${TAG}/ > /tmp/$TARNAME || exit 1
 echo "Gizipping the archive"
 rm -f /tmp/$TARNAME.gz
diff --git a/utils/releasetools/02_upload_tarball.sh b/utils/releasetools/02_upload_tarball.sh
index ed7065388..6400efad7 100755
--- a/utils/releasetools/02_upload_tarball.sh
+++ b/utils/releasetools/02_upload_tarball.sh
@@ -1,6 +1,22 @@
 #!/bin/bash
+if [ $# != "1" ]
+then
+    echo "Usage: ./utils/releasetools/02_upload_tarball.sh <version_tag>"
+    exit 1
+fi
+
 echo "Uploading..."
-scp /tmp/redis-${1}.tar.gz antirez@antirez.com:/var/virtual/download.redis.io/httpdocs/releases/
-echo "Updating web site... (press any key if it is a stable release, or Ctrl+C)"
+scp /tmp/redis-${1}.tar.gz ubuntu@host.redis.io:/var/www/download/releases/
+echo "Updating web site... "
+echo "Please check the github action tests for the release."
+echo "Press any key if it is a stable release, or Ctrl+C to abort"
 read x
-ssh antirez@antirez.com "cd /var/virtual/download.redis.io/httpdocs; ./update.sh ${1}"
+ssh ubuntu@host.redis.io "cd /var/www/download;
+                          rm -rf redis-${1}.tar.gz;
+                          wget http://download.redis.io/releases/redis-${1}.tar.gz;
+                          tar xvzf redis-${1}.tar.gz;
+                          rm -rf redis-stable;
+                          mv redis-${1} redis-stable;
+                          tar cvzf redis-stable.tar.gz redis-stable;
+                          rm -rf redis-${1}.tar.gz;
+                          "
diff --git a/utils/releasetools/03_test_release.sh b/utils/releasetools/03_test_release.sh
index 3dfdcd6a3..169e965d5 100755
--- a/utils/releasetools/03_test_release.sh
+++ b/utils/releasetools/03_test_release.sh
@@ -1,7 +1,8 @@
 #!/bin/sh
+set -e
 if [ $# != "1" ]
 then
-    echo "Usage: ${0} <git-ref>"
+    echo "Usage: ./utils/releasetools/03_test_release.sh <version_tag>"
     exit 1
 fi
 
@@ -9,18 +10,18 @@ TAG=$1
 TARNAME="redis-${TAG}.tar.gz"
 DOWNLOADURL="http://download.redis.io/releases/${TARNAME}"
 
-ssh antirez@metal "export TERM=xterm;
-                   cd /tmp;
-                   rm -rf test_release_tmp_dir;
-                   cd test_release_tmp_dir;
-                   rm -f $TARNAME;
-                   rm -rf redis-${TAG};
-                   wget $DOWNLOADURL;
-                   tar xvzf $TARNAME;
-                   cd redis-${TAG};
-                   make;
-                   ./runtest;
-                   ./runtest-sentinel;
-                   if [ -x runtest-cluster ]; then
-                       ./runtest-cluster;
-                   fi"
+echo "Doing sanity test on the actual tarball"
+
+cd /tmp
+rm -rf test_release_tmp_dir
+cd test_release_tmp_dir
+rm -f $TARNAME
+rm -rf redis-${TAG}
+wget $DOWNLOADURL
+tar xvzf $TARNAME
+cd redis-${TAG}
+make
+./runtest
+./runtest-sentinel
+./runtest-cluster
+./runtest-moduleapi
diff --git a/utils/releasetools/04_release_hash.sh b/utils/releasetools/04_release_hash.sh
index 9d5c6ad4b..bc1ebb66c 100755
--- a/utils/releasetools/04_release_hash.sh
+++ b/utils/releasetools/04_release_hash.sh
@@ -1,8 +1,14 @@
 #!/bin/bash
+if [ $# != "1" ]
+then
+    echo "Usage: ./utils/releasetools/04_release_hash.sh <version_tag>"
+    exit 1
+fi
+
 SHA=$(curl -s http://download.redis.io/releases/redis-${1}.tar.gz | shasum -a 256 | cut -f 1 -d' ')
 ENTRY="hash redis-${1}.tar.gz sha256 $SHA http://download.redis.io/releases/redis-${1}.tar.gz"
 echo $ENTRY >> ~/hack/redis-hashes/README
-vi ~/hack/redis-hashes/README
+vi ../redis-hashes/README
 echo "Press any key to commit, Ctrl-C to abort)."
 read yes
-(cd ~/hack/redis-hashes; git commit -a -m "${1} hash."; git push)
+(cd ../redis-hashes; git commit -a -m "${1} hash."; git push)