Update to 9.4.3.1-r3 (#1052)

* Update to 9.4.3.1-r3

Author: Pradip Routa

Makefile

@@ -106,8 +106,11 @@ include Makefile.pipeline.mk
 
 ifeq "$(COMMAND)" "podman"
 	NUM_CPU ?= $(or $(shell podman info --format "{{.Host.CPUs}}"),2)
-# Push options used while pushing the manifest
 	PUSH_OPTIONS="$(IMAGE_FORMAT) --rm"
+	COMPRESSION_FLAGS := --compression-format=gzip --force-compression=true
+	ifeq "$(shell uname -s)" "Darwin"
+		VOLUME_MOUNT_OPTIONS:=
+	endif
 else ifeq "$(COMMAND)" "docker"
 	NUM_CPU ?= $(or $(shell docker info --format "{{ .NCPU }}"),2)
 	PUSH_OPTIONS="--purge"
@@ -138,13 +141,6 @@ else ifeq "$(ARCH)" "arm64"
 	MQ_ARCHIVE_DEV_ARCH:=ARM64
 endif
 
-# Make sure we don't use VOLUME_MOUNT_OPTIONS for Podman on macOS
-ifeq "$(COMMAND)" "podman"
-	ifeq "$(shell uname -s)" "Darwin"
-		VOLUME_MOUNT_OPTIONS:=
-	endif
-endif
-
 
 ###############################################################################
 # Build targets
@@ -378,7 +374,7 @@ push-advancedserver:
 	$(info $(SPACER)$(shell printf $(TITLE)"Push production image to $(MQ_DELIVERY_REGISTRY_FULL_PATH)"$(END)))
 	$(COMMAND) login $(MQ_DELIVERY_REGISTRY_HOSTNAME) -u $(MQ_DELIVERY_REGISTRY_USER) -p $(MQ_DELIVERY_REGISTRY_CREDENTIAL)
 	$(COMMAND) tag $(MQ_IMAGE_ADVANCEDSERVER)\:$(MQ_TAG) $(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_FULL_RELEASE_NAME)
-	$(COMMAND) push $(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_FULL_RELEASE_NAME)
+	$(COMMAND) push $(COMPRESSION_FLAGS) $(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_FULL_RELEASE_NAME)
 
 .PHONY: push-devserver
 push-devserver:
@@ -388,7 +384,7 @@ push-devserver:
 	$(info $(SPACER)$(shell printf $(TITLE)"Push developer image to $(MQ_DELIVERY_REGISTRY_FULL_PATH)"$(END)))
 	$(COMMAND) login $(MQ_DELIVERY_REGISTRY_HOSTNAME) -u $(MQ_DELIVERY_REGISTRY_USER) -p $(MQ_DELIVERY_REGISTRY_CREDENTIAL)
 	$(COMMAND) tag $(MQ_IMAGE_DEVSERVER)\:$(MQ_TAG) $(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_DEV_FULL_RELEASE_NAME)
-	$(COMMAND) push $(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_DEV_FULL_RELEASE_NAME)
+	$(COMMAND) push $(COMPRESSION_FLAGS) $(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_DEV_FULL_RELEASE_NAME)
 
 .PHONY: pull-advancedserver
 pull-advancedserver:
@@ -424,10 +420,10 @@ endif
 	$(info $(shell printf "** Determined the built $(MQ_IMAGE_ADVANCEDSERVER_PPC64LE) has a digest of $(MQ_IMAGE_ADVANCEDSERVER_PPC64LE_DIGEST)**"$(END)))
 ifneq "$(LTS)" "true"
 	$(info $(shell printf "** Calling script to create fat-manifest for $(MQ_IMAGE_DEVSERVER_MANIFEST)**"$(END)))
-	COMMAND=$(COMMAND) PUSH_OPTIONS=$(PUSH_OPTIONS) ./$(BUILD_SCRIPTS_PATH)/create-manifest-list.sh -r $(MQ_DELIVERY_REGISTRY_HOSTNAME) -n $(MQ_DELIVERY_REGISTRY_NAMESPACE) -i $(MQ_IMAGE_DEVSERVER) -t $(MQ_MANIFEST_TAG) -u $(MQ_ARCHIVE_REPOSITORY_USER) -p $(MQ_ARCHIVE_REPOSITORY_CREDENTIAL)  -d "$(MQ_IMAGE_DEVSERVER_AMD64_DIGEST) $(MQ_IMAGE_DEVSERVER_S390X_DIGEST) $(MQ_IMAGE_DEVSERVER_PPC64LE_DIGEST)" $(END)
+	COMMAND=$(COMMAND) PUSH_OPTIONS=$(PUSH_OPTIONS) COMPRESSION_FLAGS="$(COMPRESSION_FLAGS)" ./$(BUILD_SCRIPTS_PATH)/create-manifest-list.sh -r $(MQ_DELIVERY_REGISTRY_HOSTNAME) -n $(MQ_DELIVERY_REGISTRY_NAMESPACE) -i $(MQ_IMAGE_DEVSERVER) -t $(MQ_MANIFEST_TAG) -u $(MQ_ARCHIVE_REPOSITORY_USER) -p $(MQ_ARCHIVE_REPOSITORY_CREDENTIAL)  -d "$(MQ_IMAGE_DEVSERVER_AMD64_DIGEST) $(MQ_IMAGE_DEVSERVER_S390X_DIGEST) $(MQ_IMAGE_DEVSERVER_PPC64LE_DIGEST)" $(END)
 endif
 	$(info $(shell printf "** Calling script to create fat-manifest for $(MQ_IMAGE_ADVANCEDSERVER_MANIFEST)**"$(END)))
-	COMMAND=$(COMMAND) PUSH_OPTIONS=$(PUSH_OPTIONS) ./$(BUILD_SCRIPTS_PATH)/create-manifest-list.sh -r $(MQ_DELIVERY_REGISTRY_HOSTNAME) -n $(MQ_DELIVERY_REGISTRY_NAMESPACE) -i $(MQ_IMAGE_ADVANCEDSERVER) -t $(MQ_MANIFEST_TAG) -u $(MQ_ARCHIVE_REPOSITORY_USER) -p $(MQ_ARCHIVE_REPOSITORY_CREDENTIAL) -d "$(MQ_IMAGE_ADVANCEDSERVER_AMD64_DIGEST) $(MQ_IMAGE_ADVANCEDSERVER_S390X_DIGEST) $(MQ_IMAGE_ADVANCEDSERVER_PPC64LE_DIGEST)" $(END)
+	COMMAND=$(COMMAND) PUSH_OPTIONS=$(PUSH_OPTIONS) COMPRESSION_FLAGS="$(COMPRESSION_FLAGS)" ./$(BUILD_SCRIPTS_PATH)/create-manifest-list.sh -r $(MQ_DELIVERY_REGISTRY_HOSTNAME) -n $(MQ_DELIVERY_REGISTRY_NAMESPACE) -i $(MQ_IMAGE_ADVANCEDSERVER) -t $(MQ_MANIFEST_TAG) -u $(MQ_ARCHIVE_REPOSITORY_USER) -p $(MQ_ARCHIVE_REPOSITORY_CREDENTIAL) -d "$(MQ_IMAGE_ADVANCEDSERVER_AMD64_DIGEST) $(MQ_IMAGE_ADVANCEDSERVER_S390X_DIGEST) $(MQ_IMAGE_ADVANCEDSERVER_PPC64LE_DIGEST)" $(END)
 
 #sps : modify the build scripts path
 .PHONY: build-manifest

pipeline.env

@@ -1,8 +1,8 @@
 ###########################################################################################################################################################
 
-BASE_MQ_LOCKED=true
+BASE_MQ_LOCKED=false
 MAIN_BRANCH=v9.4.3
 LTS=false
-RELEASE=r2
+RELEASE=r3
 CBI_TAG=1.24.6-9.6-1755695350-05092025_094059
 ###########################################################################################################################################################

sps-build-scripts/create-manifest-list.sh

@@ -33,36 +33,34 @@ END="\033[0m"
 
 ERROR=${RED}
 
-TICK="\xE2\x9C\x94"
 CROSS="\xE2\x9C\x97"
 REDCROSS=${RED}${CROSS}${END}
 
 
-SPACER="\n\n"
-
 while getopts r:n:i:t:d:h:u:p: flag; do
     case "${flag}" in
-        r) REGISTRY=${OPTARG} ;;
-        n) NAMESPACE=${OPTARG} ;;
-        i) IMAGE=${OPTARG} ;;
-        t) TAG=${OPTARG} ;;
-        d) DIGESTS=${OPTARG} ;;
-        u) USER=${OPTARG} ;;
-        p) CREDENTIAL=${OPTARG} ;;
+        r) REGISTRY="${OPTARG}" ;;
+        n) NAMESPACE="${OPTARG}" ;;
+        i) IMAGE="${OPTARG}" ;;
+        t) TAG="${OPTARG}" ;;
+        d) DIGESTS="${OPTARG}" ;;
+        u) USER="${OPTARG}" ;;
+        p) CREDENTIAL="${OPTARG}" ;;
         *) 
             echo "Unknown option: -${flag}" >&2
             ;;
     esac
 done
 
+
 if [[ -z $REGISTRY || -z $NAMESPACE || -z $IMAGE || -z $TAG || -z $DIGESTS ]] ; then 
   printf "${REDCROSS} ${ERROR}Missing parameter!${END}\n"
   printf "${ERROR}$usage${END}\n"
   exit 1
 fi
 
 echo "At create-manifest, COMMAND: ${COMMAND}"
-if [ "$COMMAND" == "docker" ]; then
+if [[ "$COMMAND" == "docker" ]]; then
   # Docker CLI manifest commands require experimental features to be turned on
   export DOCKER_CLI_EXPERIMENTAL=enabled
 fi
@@ -74,15 +72,15 @@ done
 
 $COMMAND login $REGISTRY -u $USER -p $CREDENTIAL
 $COMMAND manifest create $REGISTRY/$NAMESPACE/$IMAGE:$TAG $MANIFESTS > /dev/null
-MANIFEST_DIGEST=$($COMMAND manifest push $PUSH_OPTIONS $REGISTRY/$NAMESPACE/$IMAGE:$TAG)
+MANIFEST_DIGEST=$($COMMAND manifest push $PUSH_OPTIONS $COMPRESSION_FLAGS $REGISTRY/$NAMESPACE/$IMAGE:$TAG)
 
-if [ "$COMMAND" = "podman" ]; then
+if [[ "$COMMAND" = "podman" ]]; then
     echo "Inspecting image with skopeo: docker://$REGISTRY/$NAMESPACE/$IMAGE:$TAG"
     MANIFEST_DIGEST=$(skopeo inspect docker://$REGISTRY/$NAMESPACE/$IMAGE:$TAG | jq -r '.Digest')
 fi
 
-if [ -z "$MANIFEST_DIGEST" ]; then
+if [[ -z "$MANIFEST_DIGEST" ]]; then
   echo "Warning: At create-manifest, Failed to retrieve manifest digest"
 else
   echo "MANIFEST_DIGEST: $MANIFEST_DIGEST"
-fi
+fi