[GitHub] mrutkows closed pull request #91: Add the missing RELEASE_URL and RELEASE_VERSION_URL to access release URL

[GitBox <gi...@apache.org>]

mrutkows closed pull request #91: Add the missing RELEASE_URL and RELEASE_VERSION_URL to access release URL
URL: https://github.com/apache/incubator-openwhisk-release/pull/91
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/tools/clean_remote_release_artifacts.sh b/tools/clean_remote_release_artifacts.sh
index ccda065..851c7f3 100755
--- a/tools/clean_remote_release_artifacts.sh
+++ b/tools/clean_remote_release_artifacts.sh
@@ -27,6 +27,6 @@ SVN_PASSWORD=$3
 
 source "$SCRIPTDIR/load_config.sh" "$WORK_DIR" "$SVN_USERNAME" "$SVN_PASSWORD"
 
-if [[ `wget -S --spider $CURRENT_VERSION_URL  2>&1 | grep 'HTTP/1.1 200 OK'` ]]; then
-    svn delete $CURRENT_VERSION_URL -m "Removing Apache OpenWhisk release ${full_version}." $CREDENTIALS
+if [[ `wget -S --spider $RELEASE_VERSION_URL  2>&1 | grep 'HTTP/1.1 200 OK'` ]]; then
+    svn delete $RELEASE_VERSION_URL -m "Removing Apache OpenWhisk release ${version}." $CREDENTIALS
 fi
diff --git a/tools/load_config.sh b/tools/load_config.sh
index 7cb36eb..e70f7a5 100755
--- a/tools/load_config.sh
+++ b/tools/load_config.sh
@@ -38,6 +38,7 @@ CONFIG=$(read_file $SCRIPTDIR/config.json)
 PUBLISH_STAGE=$(json_by_key "$CONFIG" "publish_stage")
 repos=$(echo $(json_by_key "$CONFIG" "RepoList") | sed 's/[][]//g')
 STAGE_URL=$(json_by_key "$CONFIG" "stage_url")
+RELEASE_URL=$(json_by_key "$CONFIG" "release_url")
 
 version_key="versioning"
 version=$(json_by_key "$CONFIG" ${version_key}.version)
@@ -52,6 +53,10 @@ if [ ! -z "$pre_release_version" ]; then
 fi
 
 REMOTE_PATH="openwhisk-$full_version"
+REMOTE_PATH_RELEASE="openwhisk-$version"
 
 CURRENT_VERSION_URL="$STAGE_URL/${REMOTE_PATH}/"
 CURRENT_VERSION_DIR="$OPENWHISK_SVN/$REMOTE_PATH"
+
+RELEASE_VERSION_URL_STAGE="$RELEASE_URL/${REMOTE_PATH}/"
+RELEASE_VERSION_URL="$RELEASE_URL/${REMOTE_PATH_RELEASE}/"
diff --git a/tools/move_stage_to_release.sh b/tools/move_stage_to_release.sh
index c0b5ba3..8048b79 100755
--- a/tools/move_stage_to_release.sh
+++ b/tools/move_stage_to_release.sh
@@ -33,4 +33,7 @@ fi
 
 if [[ `wget -S --spider $CURRENT_VERSION_URL  2>&1 | grep 'HTTP/1.1 200 OK'` ]]; then
     svn copy $CURRENT_VERSION_URL $RELEASE_URL -m "Releasing Apache OpenWhisk release ${full_version}." $CREDENTIALS
+    if [ "$full_version" != "$version" ]; then
+        svn mv $RELEASE_VERSION_URL_STAGE $RELEASE_VERSION_URL -m "Remaning the directory from ${full_version} to ${version}." $CREDENTIALS
+    fi
 fi


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services