Merge branch 'dev-release-mgmt'

.github/scripts/configure_versions_script.sh

@@ -18,12 +18,13 @@ ESS_IMAGE_VERSION="${ORIG_ESS_IMAGE_VERSION}-${BUILD_NUMBER}"
 # ESS_IMAGE_VERSION="${ORIG_ESS_IMAGE_VERSION}-${UNIQUE_VERSION_HASH}"
 
 # Output configured versions for viewing
+echo "***Anax Version, No Build Number: ${ORIG_ANAX_IMAGE_VERSION}"
 echo "***Anax Version: ${ANAX_IMAGE_VERSION}"
 echo "***CSS Version: ${CSS_IMAGE_VERSION}"
 echo "***ESS Version: ${ESS_IMAGE_VERSION}"
 
 # Put script variables into workflow env. variables
-echo "VERSION_NO_BUILD_NUMBER=$ORIG_ANAX_IMAGE_VERSION" >> $GITHUB_ENV
-echo "ANAX_IMAGE_VERSION=$ANAX_IMAGE_VERSION" >> $GITHUB_ENV
-echo "CSS_IMAGE_VERSION=$CSS_IMAGE_VERSION" >> $GITHUB_ENV
-echo "ESS_IMAGE_VERSION=$ESS_IMAGE_VERSION" >> $GITHUB_ENV
+echo "VERSION_NO_BUILD_NUMBER=$ORIG_ANAX_IMAGE_VERSION" >> "$GITHUB_OUTPUT"
+echo "ANAX_IMAGE_VERSION=$ANAX_IMAGE_VERSION" >> "$GITHUB_OUTPUT"
+echo "CSS_IMAGE_VERSION=$CSS_IMAGE_VERSION" >> "$GITHUB_OUTPUT"
+echo "ESS_IMAGE_VERSION=$ESS_IMAGE_VERSION" >> "$GITHUB_OUTPUT"

.github/scripts/docker_push_script.sh

@@ -19,6 +19,12 @@ for image in "${images[@]}"; do
 
         docker tag ${IMAGE_REPO}/${image}:testing ${GITHUB_CONTAINER_REGISTRY}/${image}:testing
         docker push ${GITHUB_CONTAINER_REGISTRY}/${image}:testing
+    else
+        docker tag ${IMAGE_REPO}/${image}:testing ${IMAGE_REPO}/${image}:testing_${GITHUB_REF_NAME}
+        docker push ${IMAGE_REPO}/${image}:testing_${GITHUB_REF_NAME}
+
+        docker tag ${IMAGE_REPO}/${image}:testing ${GITHUB_CONTAINER_REGISTRY}/${image}:testing_${GITHUB_REF_NAME}
+        docker push ${GITHUB_CONTAINER_REGISTRY}/${image}:testing_${GITHUB_REF_NAME}
     fi
 
 done

.github/scripts/docker_save_script.sh

@@ -0,0 +1,41 @@
+#!/bin/bash
+
+if [[ -z "$ANAX_IMAGE_VERSION" ]]; then
+    echo "::error file=docker_save_script.sh::Anax Image Version is unset, check the 'Configure Version Variables' step"
+    exit 1
+fi
+if [[ -z "$CSS_IMAGE_VERSION" ]]; then
+    echo "::error file=docker_save_script.sh::CSS Image Version is unset, check the 'Configure Version Variables' step"
+    exit 1
+fi
+if [[ -z "$ESS_IMAGE_VERSION" ]]; then
+    echo "::error file=docker_save_script.sh::ESS Image Version is unset, check the 'Configure Version Variables' step"
+    exit 1
+fi
+
+# Names of the images created for each architecture
+if [[ ${arch} == 'amd64' ]]; then
+    images=('amd64_agbot' 'amd64_anax' 'amd64_anax_k8s' 'amd64_auto-upgrade-cronjob_k8s' 'amd64_cloud-sync-service' 'amd64_edge-sync-service')
+elif [[ ${arch} == 'ppc64el' ]]; then
+    images=('ppc64el_anax' 'ppc64el_anax_k8s' 'ppc64el_auto-upgrade-cronjob_k8s' 'ppc64el_edge-sync-service')
+elif [[ ${arch} == 'arm64' ]]; then
+    images=('arm64_anax' 'arm64_anax_k8s' 'arm64_auto-upgrade-cronjob_k8s' 'arm64_edge-sync-service')
+elif [[ ${arch} == 's390x' ]]; then
+    images=('s390x_anax' 's390x_anax_k8s' 's390x_auto-upgrade-cronjob_k8s' 's390x_edge-sync-service')
+fi
+
+# Save those images
+for image in "${images[@]}"; do
+
+    if [[ ${image} == *"cloud-sync-service"* ]]; then
+        VERSION=${CSS_IMAGE_VERSION}
+    elif [[ ${image} == *"edge-sync-service"* ]]; then
+        VERSION=${ESS_IMAGE_VERSION}
+    else
+        VERSION=${ANAX_IMAGE_VERSION}
+    fi
+
+    docker tag ${IMAGE_REPO}/${image}:testing ${IMAGE_REPO}/${image}:${VERSION}
+    docker save ${IMAGE_REPO}/${image}:${VERSION} | gzip > ${image}.tar.gz
+
+done

.github/scripts/package_push.sh

@@ -22,6 +22,12 @@ if [[ "$GITHUB_REF" == 'refs/heads/master' ]]; then
 
     docker tag ${IMAGE_REPO}/${arch}_anax_debian:testing ${GITHUB_CONTAINER_REGISTRY}/${arch}_anax_debian:testing
     docker push ${GITHUB_CONTAINER_REGISTRY}/${arch}_anax_debian:testing
+else
+    docker tag ${IMAGE_REPO}/${arch}_anax_debian:testing ${IMAGE_REPO}/${arch}_anax_debian:testing_${GITHUB_REF_NAME}
+    docker push ${IMAGE_REPO}/${arch}_anax_debian:testing_${GITHUB_REF_NAME}
+
+    docker tag ${IMAGE_REPO}/${arch}_anax_debian:testing ${GITHUB_CONTAINER_REGISTRY}/${arch}_anax_debian:testing_${GITHUB_REF_NAME}
+    docker push ${GITHUB_CONTAINER_REGISTRY}/${arch}_anax_debian:testing_${GITHUB_REF_NAME}
 fi
 
 # Deal with RPM Package
@@ -53,5 +59,11 @@ if [[ ${arch} == 'amd64' || ${arch} == 'ppc64el' || ${arch} == 's390x' ]]; then
 
         docker tag ${IMAGE_REPO}/${arch}_anax_rpm:testing ${GITHUB_CONTAINER_REGISTRY}/${arch}_anax_rpm:testing
         docker push ${GITHUB_CONTAINER_REGISTRY}/${arch}_anax_rpm:testing
+    else
+        docker tag ${IMAGE_REPO}/${arch}_anax_rpm:testing ${IMAGE_REPO}/${arch}_anax_rpm:testing_${GITHUB_REF_NAME}
+        docker push ${IMAGE_REPO}/${arch}_anax_rpm:testing_${GITHUB_REF_NAME}
+
+        docker tag ${IMAGE_REPO}/${arch}_anax_rpm:testing ${GITHUB_CONTAINER_REGISTRY}/${arch}_anax_rpm:testing_${GITHUB_REF_NAME}
+        docker push ${GITHUB_CONTAINER_REGISTRY}/${arch}_anax_rpm:testing_${GITHUB_REF_NAME}
     fi
 fi