Skip to content

Commit e4001a5

Browse files
dselvara1dselvara1
committed
Update to 9.4.0.15-r4
1 parent 74d2f08 commit e4001a5

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

‎Makefile‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,16 @@ MQ_VERSION_VRM=$(subst $(SPACE),.,$(wordlist 1,3,$(subst .,$(SPACE),$(MQ_VERSION
104104
#sps : Set the pipeline parameters
105105
include Makefile.pipeline.mk
106106

107+
# Make sure we don't use VOLUME_MOUNT_OPTIONS for Podman on macOS
108+
# Push options used while pushing the manifest are set
109+
# Compression flags while pushing images and manifest are set
107110
ifeq "$(COMMAND)" "podman"
108111
NUM_CPU ?= $(or $(shell podman info --format "{{.Host.CPUs}}"),2)
109-
# Push options used while pushing the manifest
110112
PUSH_OPTIONS="$(IMAGE_FORMAT) --rm"
113+
COMPRESSION_FLAGS := --compression-format=gzip --force-compression=true
114+
ifeq "$(shell uname -s)" "Darwin"
115+
VOLUME_MOUNT_OPTIONS:=
116+
endif
111117
else ifeq "$(COMMAND)" "docker"
112118
NUM_CPU ?= $(or $(shell docker info --format "{{ .NCPU }}"),2)
113119
PUSH_OPTIONS="--purge"
@@ -138,12 +144,6 @@ else ifeq "$(ARCH)" "arm64"
138144
MQ_ARCHIVE_DEV_ARCH:=ARM64
139145
endif
140146

141-
# Make sure we don't use VOLUME_MOUNT_OPTIONS for Podman on macOS
142-
ifeq "$(COMMAND)" "podman"
143-
ifeq "$(shell uname -s)" "Darwin"
144-
VOLUME_MOUNT_OPTIONS:=
145-
endif
146-
endif
147147

148148
###############################################################################
149149
# Build targets
@@ -380,7 +380,7 @@ push-advancedserver:
380380
$(info $(SPACER)$(shell printf $(TITLE)"Push production image to $(MQ_DELIVERY_REGISTRY_FULL_PATH)"$(END)))
381381
$(COMMAND) login $(MQ_DELIVERY_REGISTRY_HOSTNAME) -u $(MQ_DELIVERY_REGISTRY_USER) -p $(MQ_DELIVERY_REGISTRY_CREDENTIAL)
382382
$(COMMAND) tag $(MQ_IMAGE_ADVANCEDSERVER)\:$(MQ_TAG) $(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_FULL_RELEASE_NAME)
383-
$(COMMAND) push $(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_FULL_RELEASE_NAME)
383+
$(COMMAND) push $(COMPRESSION_FLAGS) $(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_FULL_RELEASE_NAME)
384384

385385
.PHONY: push-devserver
386386
push-devserver:
@@ -390,7 +390,7 @@ push-devserver:
390390
$(info $(SPACER)$(shell printf $(TITLE)"Push developer image to $(MQ_DELIVERY_REGISTRY_FULL_PATH)"$(END)))
391391
$(COMMAND) login $(MQ_DELIVERY_REGISTRY_HOSTNAME) -u $(MQ_DELIVERY_REGISTRY_USER) -p $(MQ_DELIVERY_REGISTRY_CREDENTIAL)
392392
$(COMMAND) tag $(MQ_IMAGE_DEVSERVER)\:$(MQ_TAG) $(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_DEV_FULL_RELEASE_NAME)
393-
$(COMMAND) push $(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_DEV_FULL_RELEASE_NAME)
393+
$(COMMAND) push $(COMPRESSION_FLAGS) $(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_DEV_FULL_RELEASE_NAME)
394394

395395
.PHONY: pull-advancedserver
396396
pull-advancedserver:
@@ -431,10 +431,10 @@ endif
431431
$(info $(shell printf "** Determined the built $(MQ_IMAGE_ADVANCEDSERVER_PPC64LE) has a digest of $(MQ_IMAGE_ADVANCEDSERVER_PPC64LE_DIGEST)**"$(END)))
432432
ifneq "$(LTS)" "true"
433433
$(info $(shell printf "** Calling script to create fat-manifest for $(MQ_IMAGE_DEVSERVER_MANIFEST)**"$(END)))
434-
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)
434+
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)
435435
endif
436436
$(info $(shell printf "** Calling script to create fat-manifest for $(MQ_IMAGE_ADVANCEDSERVER_MANIFEST)**"$(END)))
437-
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)
437+
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)
438438

439439
.PHONY: build-manifest
440440
build-manifest: build-skopeo-container
@@ -444,7 +444,7 @@ build-manifest: build-skopeo-container
444444
$(info $(shell printf "** Determined the built $(MQ_IMAGE_DEVSERVER_AMD64) has a digest of $(MQ_IMAGE_DEVSERVER_AMD64_DIGEST)**"$(END)))
445445
$(info $(shell printf "** Determined the built $(MQ_IMAGE_DEVSERVER_S390X) has a digest of $(MQ_IMAGE_DEVSERVER_S390X_DIGEST)**"$(END)))
446446
$(info $(shell printf "** Determined the built $(MQ_IMAGE_DEVSERVER_PPC64LE) has a digest of $(MQ_IMAGE_DEVSERVER_PPC64LE_DIGEST)**"$(END)))
447-
447+
448448
$(eval MQ_IMAGE_ADVANCEDSERVER_AMD64_DIGEST=$(shell $(COMMAND) run skopeo:latest --override-os linux inspect --creds $(MQ_ARCHIVE_REPOSITORY_USER):$(MQ_ARCHIVE_REPOSITORY_CREDENTIAL) docker://$(MQ_IMAGE_ADVANCEDSERVER_AMD64) | jq -r .Digest))
449449
$(eval MQ_IMAGE_ADVANCEDSERVER_S390X_DIGEST=$(shell $(COMMAND) run skopeo:latest --override-os linux inspect --creds $(MQ_ARCHIVE_REPOSITORY_USER):$(MQ_ARCHIVE_REPOSITORY_CREDENTIAL) docker://$(MQ_IMAGE_ADVANCEDSERVER_S390X) | jq -r .Digest))
450450
$(eval MQ_IMAGE_ADVANCEDSERVER_PPC64LE_DIGEST=$(shell $(COMMAND) run skopeo:latest --override-os linux inspect --creds $(MQ_ARCHIVE_REPOSITORY_USER):$(MQ_ARCHIVE_REPOSITORY_CREDENTIAL) docker://$(MQ_IMAGE_ADVANCEDSERVER_PPC64LE) | jq -r .Digest))

‎pipeline.env‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
###########################################################################################################################################################
22
MAIN_BRANCH=v9.4.0
3-
RELEASE=r3
4-
BASE_MQ_LOCKED=true
3+
RELEASE=r4
4+
BASE_MQ_LOCKED=false
55
CBI_TAG=1.24.6-9.6-1755695350-05092025_094059
66
###########################################################################################################################################################

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ done
7272

7373
$COMMAND login $REGISTRY -u $USER -p $CREDENTIAL
7474
$COMMAND manifest create $REGISTRY/$NAMESPACE/$IMAGE:$TAG $MANIFESTS > /dev/null
75-
MANIFEST_DIGEST=$($COMMAND manifest push $PUSH_OPTIONS $REGISTRY/$NAMESPACE/$IMAGE:$TAG)
75+
MANIFEST_DIGEST=$($COMMAND manifest push $PUSH_OPTIONS $COMPRESSION_FLAGS $REGISTRY/$NAMESPACE/$IMAGE:$TAG)
7676

7777
if [ "$COMMAND" = "podman" ]; then
7878
echo "Inspecting image with skopeo: docker://$REGISTRY/$NAMESPACE/$IMAGE:$TAG"

0 commit comments

Comments
 (0)