Skip to content

Commit c2b8753

Browse files
Nathaniel J KingGitHub Enterprise
Nathaniel J King
authored and
GitHub Enterprise
committed
Merge pull request #120 from mq-cloudpak/njknewrelease
Remove release-candidate code
2 parents e8d26aa + f8ae8b0 commit c2b8753

File tree

2 files changed

+41
-46
lines changed

2 files changed

+41
-46
lines changed

‎.travis.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ env:
2828
- MAIN_BRANCH=private-master
2929
- MQ_LTS_VERSION=9.2.0.1
3030
- TAGCACHE_FILE=tagcache
31+
- RELEASE=
32+
- RELEASE_LTS=
3133

3234
go_import_path: "github.com/ibm-messaging/mq-container"
3335

@@ -79,8 +81,6 @@ jobs:
7981
- TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics"
8082
- MQ_ARCHIVE_REPOSITORY=$MQ_920_ARCHIVE_REPOSITORY_S390X
8183
- MQ_ARCHIVE_REPOSITORY_DEV=$MQ_920_ARCHIVE_REPOSITORY_DEV_S390X
82-
- RELEASE=""
83-
- RELEASE_CANDIDATE=""
8484
script: bash -e travis-build-scripts/run.sh
8585
- stage: push-manifest
8686
if: branch = private-master AND type != pull_request OR tag =~ ^release-candidate*
@@ -99,6 +99,7 @@ jobs:
9999
- LTS=true
100100
- TAGCACHE_FILE=tagcache-lts
101101
- MQ_VERSION=$MQ_LTS_VERSION
102+
- RELEASE=$RELEASE_LTS
102103
script: bash -e travis-build-scripts/global-tag.sh
103104
- stage: build
104105
if: branch = private-master OR tag =~ ^release-candidate*
@@ -109,6 +110,7 @@ jobs:
109110
- TAGCACHE_FILE=tagcache-lts
110111
- MQ_VERSION=$MQ_LTS_VERSION
111112
- MQ_ARCHIVE_REPOSITORY=$MQ_9201_EUS_ARCHIVE_REPOSITORY_AMD64
113+
- RELEASE=$RELEASE_LTS
112114
script: bash -e travis-build-scripts/run.sh
113115
- stage: build
114116
if: branch = private-master OR tag =~ ^release-candidate*
@@ -120,6 +122,7 @@ jobs:
120122
- MQ_VERSION=$MQ_LTS_VERSION
121123
- TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics"
122124
- MQ_ARCHIVE_REPOSITORY=$MQ_9201_EUS_ARCHIVE_REPOSITORY_S390X
125+
- RELEASE=$RELEASE_LTS
123126
script: bash -e travis-build-scripts/run.sh
124127
- stage: push-manifest
125128
if: branch = private-master AND type != pull_request OR tag =~ ^release-candidate*
@@ -129,6 +132,7 @@ jobs:
129132
- TAGCACHE_FILE=tagcache-lts
130133
- MQ_VERSION=$MQ_LTS_VERSION
131134
- PUSH_MANIFEST_ONLY=true
135+
- RELEASE=$RELEASE_LTS
132136
script: bash -e travis-build-scripts/run.sh
133137

134138
before_install:

‎Makefile‎

Lines changed: 35 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ include config.env
2121

2222
# RELEASE shows what release of the container code has been built
2323
RELEASE ?=
24-
# RELEASE_CANDIDATE shows what release candidate of the container code has been built
25-
RELEASE_CANDIDATE ?=
2624
# MQ_ARCHIVE_REPOSITORY is a remote repository from which to pull the MQ_ARCHIVE (if required)
2725
MQ_ARCHIVE_REPOSITORY ?=
2826
# MQ_ARCHIVE_REPOSITORY_DEV is a remote repository from which to pull the MQ_ARCHIVE_DEV (if required)
@@ -48,7 +46,7 @@ MQ_IMAGE_ADVANCEDSERVER ?=ibm-mqadvanced-server
4846
# MQ_IMAGE_DEVSERVER is the name of the built MQ Advanced for Developers image
4947
MQ_IMAGE_DEVSERVER ?=ibm-mqadvanced-server-dev
5048
# MQ_MANIFEST_TAG is the tag to use for fat-manifest
51-
MQ_MANIFEST_TAG ?= $(MQ_VERSION)$(LTS_TAG)
49+
MQ_MANIFEST_TAG ?= $(MQ_VERSION)$(RELEASE_TAG)$(LTS_TAG)$(MQ_MANIFEST_TAG_SUFFIX)
5250
# MQ_TAG is the tag of the built MQ Advanced image & MQ Advanced for Developers image
5351
MQ_TAG ?= $(MQ_MANIFEST_TAG)-$(ARCH)
5452
# COMMAND is the container command to run. "podman" or "docker"
@@ -139,8 +137,7 @@ endif
139137

140138
ifneq "$(RELEASE)" "$(EMPTY)"
141139
EXTRA_LABELS=--label release=$(RELEASE)
142-
MQ_MANIFEST_TAG=$(MQ_VERSION)-$(RELEASE)$(LTS_TAG)-$(RELEASE_CANDIDATE)
143-
MQ_TAG=$(MQ_MANIFEST_TAG)-$(ARCH)
140+
RELEASE_TAG="-$(RELEASE)"
144141
endif
145142

146143
ifeq "$(TIMESTAMPFLAT)" "$(EMPTY)"
@@ -152,35 +149,31 @@ ifeq "$(GIT_COMMIT)" "$(EMPTY)"
152149
endif
153150

154151
ifeq ($(shell [ ! -z $(TRAVIS) ] && [ "$(TRAVIS_PULL_REQUEST)" = "false" ] && [ "$(TRAVIS_BRANCH)" = "$(MAIN_BRANCH)" ] && echo true), true)
155-
RELEASE_TAG=$(shell [ -z "$(RELEASE)" ] || echo "-$(RELEASE)")
156-
RELEASE_CANDIDATE_TAG=$(shell [ -z "$(RELEASE_CANDIDATE)" ] || echo "-$(RELEASE_CANDIDATE)")
157-
MQ_MANIFEST_TAG=$(MQ_VERSION)$(RELEASE_TAG)$(LTS_TAG).$(TIMESTAMPFLAT).$(GIT_COMMIT)$(RELEASE_CANDIDATE_TAG)
158-
MQ_TAG=$(MQ_MANIFEST_TAG)-$(ARCH)
152+
MQ_MANIFEST_TAG_SUFFIX=.$(TIMESTAMPFLAT).$(GIT_COMMIT)
159153
endif
160154

161155
PATH_TO_MQ_TAG_CACHE=$(TRAVIS_BUILD_DIR)/.tagcache
162-
MQ_MANIFEST_TAG_CACHED?=$(MQ_MANIFEST_TAG)
163-
MQ_TAG_CACHED_amd64?=$(MQ_MANIFEST_TAG)-amd64
164-
MQ_TAG_CACHED_s390x?=$(MQ_MANIFEST_TAG)-s390x
165-
166156
ifneq "$(TRAVIS)" "$(EMPTY)"
167157
ifneq ("$(wildcard $(PATH_TO_MQ_TAG_CACHE))","")
168158
include $(PATH_TO_MQ_TAG_CACHE)
169159
endif
170160
endif
171161

162+
MQ_AMD64_TAG=$(MQ_MANIFEST_TAG)-amd64
163+
MQ_S390X_TAG?=$(MQ_MANIFEST_TAG)-s390x
164+
172165
# end image tagging
173166

174-
MQ_IMAGE_FULL_RELEASE_NAME=$(MQ_IMAGE_ADVANCEDSERVER):$(MQ_TAG_CACHED_$(ARCH))
175-
MQ_IMAGE_DEV_FULL_RELEASE_NAME=$(MQ_IMAGE_DEVSERVER):$(MQ_TAG_CACHED_$(ARCH))
167+
MQ_IMAGE_FULL_RELEASE_NAME=$(MQ_IMAGE_ADVANCEDSERVER):$(MQ_TAG)
168+
MQ_IMAGE_DEV_FULL_RELEASE_NAME=$(MQ_IMAGE_DEVSERVER):$(MQ_TAG)
176169

177170
#setup variables for fat-manifests
178-
MQ_IMAGE_DEVSERVER_MANIFEST=$(MQ_IMAGE_DEVSERVER):$(MQ_MANIFEST_TAG_CACHED)
179-
MQ_IMAGE_ADVANCEDSERVER_MANIFEST=$(MQ_IMAGE_ADVANCEDSERVER):$(MQ_MANIFEST_TAG_CACHED)
180-
MQ_IMAGE_DEVSERVER_AMD64=$(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_DEVSERVER):$(MQ_MANIFEST_TAG_CACHED)-amd64
181-
MQ_IMAGE_DEVSERVER_S390X=$(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_DEVSERVER):$(MQ_MANIFEST_TAG_CACHED)-s390x
182-
MQ_IMAGE_ADVANCEDSERVER_AMD64=$(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_ADVANCEDSERVER):$(MQ_MANIFEST_TAG_CACHED)-amd64
183-
MQ_IMAGE_ADVANCEDSERVER_S390X=$(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_ADVANCEDSERVER):$(MQ_MANIFEST_TAG_CACHED)-s390x
171+
MQ_IMAGE_DEVSERVER_MANIFEST=$(MQ_IMAGE_DEVSERVER):$(MQ_MANIFEST_TAG)
172+
MQ_IMAGE_ADVANCEDSERVER_MANIFEST=$(MQ_IMAGE_ADVANCEDSERVER):$(MQ_MANIFEST_TAG)
173+
MQ_IMAGE_DEVSERVER_AMD64=$(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_DEVSERVER):$(MQ_AMD64_TAG)
174+
MQ_IMAGE_DEVSERVER_S390X=$(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_DEVSERVER):$(MQ_S390X_TAG)
175+
MQ_IMAGE_ADVANCEDSERVER_AMD64=$(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_ADVANCEDSERVER):$(MQ_AMD64_TAG)
176+
MQ_IMAGE_ADVANCEDSERVER_S390X=$(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_ADVANCEDSERVER):$(MQ_S390X_TAG)
184177

185178
###############################################################################
186179
# Build targets
@@ -226,9 +219,7 @@ downloads: downloads/$(MQ_ARCHIVE_DEV) downloads/$(MQ_SDK_ARCHIVE)
226219

227220
.PHONY: cache-mq-tag
228221
cache-mq-tag:
229-
@printf "MQ_MANIFEST_TAG_CACHED=$(MQ_MANIFEST_TAG)\n" | tee $(PATH_TO_MQ_TAG_CACHE)
230-
@printf "MQ_TAG_CACHED_amd64=$(MQ_MANIFEST_TAG)-amd64\n" | tee -a $(PATH_TO_MQ_TAG_CACHE)
231-
@printf "MQ_TAG_CACHED_s390x=$(MQ_MANIFEST_TAG)-s390x\n" | tee -a $(PATH_TO_MQ_TAG_CACHE)
222+
@printf "MQ_MANIFEST_TAG=$(MQ_MANIFEST_TAG)\n" | tee $(PATH_TO_MQ_TAG_CACHE)
232223

233224
# Vendor Go dependencies for the Docker tests
234225
test/docker/vendor:
@@ -241,9 +232,9 @@ test-unit:
241232

242233
.PHONY: test-advancedserver
243234
test-advancedserver: test/docker/vendor
244-
$(info $(SPACER)$(shell printf $(TITLE)"Test $(MQ_IMAGE_ADVANCEDSERVER):$(MQ_TAG_CACHED_$(ARCH)) on $(shell docker --version)"$(END)))
245-
docker inspect $(MQ_IMAGE_ADVANCEDSERVER):$(MQ_TAG_CACHED_$(ARCH))
246-
cd test/docker && TEST_IMAGE=$(MQ_IMAGE_ADVANCEDSERVER):$(MQ_TAG_CACHED_$(ARCH)) EXPECTED_LICENSE=Production go test -parallel $(NUM_CPU) -timeout $(TEST_TIMEOUT_DOCKER) $(TEST_OPTS_DOCKER)
235+
$(info $(SPACER)$(shell printf $(TITLE)"Test $(MQ_IMAGE_ADVANCEDSERVER):$(MQ_TAG) on $(shell docker --version)"$(END)))
236+
docker inspect $(MQ_IMAGE_ADVANCEDSERVER):$(MQ_TAG)
237+
cd test/docker && TEST_IMAGE=$(MQ_IMAGE_ADVANCEDSERVER):$(MQ_TAG) EXPECTED_LICENSE=Production go test -parallel $(NUM_CPU) -timeout $(TEST_TIMEOUT_DOCKER) $(TEST_OPTS_DOCKER)
247238

248239
.PHONY: build-devjmstest
249240
build-devjmstest:
@@ -252,17 +243,17 @@ build-devjmstest:
252243

253244
.PHONY: test-devserver
254245
test-devserver: test/docker/vendor
255-
$(info $(SPACER)$(shell printf $(TITLE)"Test $(MQ_IMAGE_DEVSERVER):$(MQ_TAG_CACHED_$(ARCH)) on $(shell docker --version)"$(END)))
256-
docker inspect $(MQ_IMAGE_DEVSERVER):$(MQ_TAG_CACHED_$(ARCH))
257-
cd test/docker && TEST_IMAGE=$(MQ_IMAGE_DEVSERVER):$(MQ_TAG_CACHED_$(ARCH)) EXPECTED_LICENSE=Developer DEV_JMS_IMAGE=$(DEV_JMS_IMAGE) IBMJRE=true go test -parallel $(NUM_CPU) -timeout $(TEST_TIMEOUT_DOCKER) -tags mqdev $(TEST_OPTS_DOCKER)
246+
$(info $(SPACER)$(shell printf $(TITLE)"Test $(MQ_IMAGE_DEVSERVER):$(MQ_TAG) on $(shell docker --version)"$(END)))
247+
docker inspect $(MQ_IMAGE_DEVSERVER):$(MQ_TAG)
248+
cd test/docker && TEST_IMAGE=$(MQ_IMAGE_DEVSERVER):$(MQ_TAG) EXPECTED_LICENSE=Developer DEV_JMS_IMAGE=$(DEV_JMS_IMAGE) IBMJRE=true go test -parallel $(NUM_CPU) -timeout $(TEST_TIMEOUT_DOCKER) -tags mqdev $(TEST_OPTS_DOCKER)
258249

259250
.PHONY: coverage
260251
coverage:
261252
mkdir coverage
262253

263254
.PHONY: test-advancedserver-cover
264255
test-advancedserver-cover: test/docker/vendor coverage
265-
$(info $(SPACER)$(shell printf $(TITLE)"Test $(MQ_IMAGE_ADVANCEDSERVER):$(MQ_TAG_CACHED_$(ARCH)) with code coverage on $(shell docker --version)"$(END)))
256+
$(info $(SPACER)$(shell printf $(TITLE)"Test $(MQ_IMAGE_ADVANCEDSERVER):$(MQ_TAG) with code coverage on $(shell docker --version)"$(END)))
266257
rm -f ./coverage/unit*.cov
267258
# Run unit tests with coverage, for each package under 'internal'
268259
go list -f '{{.Name}}' ./internal/... | xargs -I {} go test -cover -covermode count -coverprofile ./coverage/unit-{}.cov ./internal/{}
@@ -274,7 +265,7 @@ test-advancedserver-cover: test/docker/vendor coverage
274265
rm -f ./test/docker/coverage/*.cov
275266
rm -f ./coverage/docker.*
276267
mkdir -p ./test/docker/coverage/
277-
cd test/docker && TEST_IMAGE=$(MQ_IMAGE_ADVANCEDSERVER):$(MQ_TAG_CACHED_$(ARCH))-cover TEST_COVER=true go test $(TEST_OPTS_DOCKER)
268+
cd test/docker && TEST_IMAGE=$(MQ_IMAGE_ADVANCEDSERVER):$(MQ_TAG)-cover TEST_COVER=true go test $(TEST_OPTS_DOCKER)
278269
echo 'mode: count' > ./coverage/docker.cov
279270
tail -q -n +2 ./test/docker/coverage/*.cov >> ./coverage/docker.cov
280271
go tool cover -html=./coverage/docker.cov -o ./coverage/docker.html
@@ -330,20 +321,20 @@ build-advancedserver-host: build-advancedserver
330321

331322
.PHONY: build-advancedserver
332323
build-advancedserver: registry-login log-build-env downloads/$(MQ_ARCHIVE) command-version
333-
$(info $(SPACER)$(shell printf $(TITLE)"Build $(MQ_IMAGE_ADVANCEDSERVER):$(MQ_TAG_CACHED_$(ARCH))"$(END)))
334-
$(call build-mq,$(MQ_IMAGE_ADVANCEDSERVER),$(MQ_TAG_CACHED_$(ARCH)),Dockerfile-server,$(MQ_ARCHIVE),mq-server)
324+
$(info $(SPACER)$(shell printf $(TITLE)"Build $(MQ_IMAGE_ADVANCEDSERVER):$(MQ_TAG)"$(END)))
325+
$(call build-mq,$(MQ_IMAGE_ADVANCEDSERVER),$(MQ_TAG),Dockerfile-server,$(MQ_ARCHIVE),mq-server)
335326

336327
.PHONY: build-devserver-host
337328
build-devserver-host: build-devserver
338329

339330
.PHONY: build-devserver
340331
build-devserver: registry-login log-build-env downloads/$(MQ_ARCHIVE_DEV) command-version
341-
$(info $(shell printf $(TITLE)"Build $(MQ_IMAGE_DEVSERVER):$(MQ_TAG_CACHED_$(ARCH))"$(END)))
342-
$(call build-mq,$(MQ_IMAGE_DEVSERVER),$(MQ_TAG_CACHED_$(ARCH)),Dockerfile-server,$(MQ_ARCHIVE_DEV),mq-dev-server)
332+
$(info $(shell printf $(TITLE)"Build $(MQ_IMAGE_DEVSERVER):$(MQ_TAG)"$(END)))
333+
$(call build-mq,$(MQ_IMAGE_DEVSERVER),$(MQ_TAG),Dockerfile-server,$(MQ_ARCHIVE_DEV),mq-dev-server)
343334

344335
.PHONY: build-advancedserver-cover
345336
build-advancedserver-cover: registry-login command-version
346-
$(COMMAND) build --build-arg BASE_IMAGE=$(MQ_IMAGE_ADVANCEDSERVER):$(MQ_TAG_CACHED_$(ARCH)) -t $(MQ_IMAGE_ADVANCEDSERVER):$(MQ_TAG_CACHED_$(ARCH))-cover -f Dockerfile-server.cover .
337+
$(COMMAND) build --build-arg BASE_IMAGE=$(MQ_IMAGE_ADVANCEDSERVER):$(MQ_TAG) -t $(MQ_IMAGE_ADVANCEDSERVER):$(MQ_TAG)-cover -f Dockerfile-server.cover .
347338

348339
.PHONY: build-explorer
349340
build-explorer: registry-login downloads/$(MQ_ARCHIVE_DEV)
@@ -352,7 +343,7 @@ build-explorer: registry-login downloads/$(MQ_ARCHIVE_DEV)
352343
.PHONY: build-sdk
353344
build-sdk: registry-login downloads/$(MQ_ARCHIVE_DEV)
354345
$(info $(shell printf $(TITLE)"Build $(MQ_IMAGE_SDK)"$(END)))
355-
$(call build-mq,mq-sdk,$(MQ_TAG_CACHED_$(ARCH)),incubating/mq-sdk/Dockerfile,$(MQ_SDK_ARCHIVE),mq-sdk)
346+
$(call build-mq,mq-sdk,$(MQ_TAG),incubating/mq-sdk/Dockerfile,$(MQ_SDK_ARCHIVE),mq-sdk)
356347

357348
.PHONY: registry-login
358349
registry-login:
@@ -392,29 +383,29 @@ pull-mq-archive-dev:
392383
push-advancedserver:
393384
$(info $(SPACER)$(shell printf $(TITLE)"Push production image to $(MQ_DELIVERY_REGISTRY_FULL_PATH)"$(END)))
394385
$(COMMAND) login $(MQ_DELIVERY_REGISTRY_HOSTNAME) -u $(MQ_DELIVERY_REGISTRY_USER) -p $(MQ_DELIVERY_REGISTRY_CREDENTIAL)
395-
$(COMMAND) tag $(MQ_IMAGE_ADVANCEDSERVER)\:$(MQ_TAG_CACHED_$(ARCH)) $(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_FULL_RELEASE_NAME)
386+
$(COMMAND) tag $(MQ_IMAGE_ADVANCEDSERVER)\:$(MQ_TAG) $(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_FULL_RELEASE_NAME)
396387
$(COMMAND) push $(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_FULL_RELEASE_NAME)
397388

398389
.PHONY: push-devserver
399390
push-devserver:
400391
$(info $(SPACER)$(shell printf $(TITLE)"Push developer image to $(MQ_DELIVERY_REGISTRY_FULL_PATH)"$(END)))
401392
$(COMMAND) login $(MQ_DELIVERY_REGISTRY_HOSTNAME) -u $(MQ_DELIVERY_REGISTRY_USER) -p $(MQ_DELIVERY_REGISTRY_CREDENTIAL)
402-
$(COMMAND) tag $(MQ_IMAGE_DEVSERVER)\:$(MQ_TAG_CACHED_$(ARCH)) $(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_DEV_FULL_RELEASE_NAME)
393+
$(COMMAND) tag $(MQ_IMAGE_DEVSERVER)\:$(MQ_TAG) $(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_DEV_FULL_RELEASE_NAME)
403394
$(COMMAND) push $(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_DEV_FULL_RELEASE_NAME)
404395

405396
.PHONY: pull-advancedserver
406397
pull-advancedserver:
407398
$(info $(SPACER)$(shell printf $(TITLE)"Pull production image from $(MQ_DELIVERY_REGISTRY_FULL_PATH)"$(END)))
408399
$(COMMAND) login $(MQ_DELIVERY_REGISTRY_HOSTNAME) -u $(MQ_DELIVERY_REGISTRY_USER) -p $(MQ_DELIVERY_REGISTRY_CREDENTIAL)
409400
$(COMMAND) pull $(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_FULL_RELEASE_NAME)
410-
$(COMMAND) tag $(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_FULL_RELEASE_NAME) $(MQ_IMAGE_ADVANCEDSERVER)\:$(MQ_TAG_CACHED_$(ARCH))
401+
$(COMMAND) tag $(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_FULL_RELEASE_NAME) $(MQ_IMAGE_ADVANCEDSERVER)\:$(MQ_TAG)
411402

412403
.PHONY: pull-devserver
413404
pull-devserver:
414405
$(info $(SPACER)$(shell printf $(TITLE)"Pull developer image from $(MQ_DELIVERY_REGISTRY_FULL_PATH)"$(END)))
415406
$(COMMAND) login $(MQ_DELIVERY_REGISTRY_HOSTNAME) -u $(MQ_DELIVERY_REGISTRY_USER) -p $(MQ_DELIVERY_REGISTRY_CREDENTIAL)
416407
$(COMMAND) pull $(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_DEV_FULL_RELEASE_NAME)
417-
$(COMMAND) tag $(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_DEV_FULL_RELEASE_NAME) $(MQ_IMAGE_DEVSERVER)\:$(MQ_TAG_CACHED_$(ARCH))
408+
$(COMMAND) tag $(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_DEV_FULL_RELEASE_NAME) $(MQ_IMAGE_DEVSERVER)\:$(MQ_TAG)
418409

419410
.PHONY: push-manifest
420411
push-manifest: build-skopeo-container
@@ -431,10 +422,10 @@ endif
431422
$(info $(shell printf "** Determined the built $(MQ_IMAGE_ADVANCEDSERVER_S390X) has a digest of $(MQ_IMAGE_ADVANCEDSERVER_S390X_DIGEST)**"$(END)))
432423
ifneq "$(LTS)" "true"
433424
$(info $(shell printf "** Calling script to create fat-manifest for $(MQ_IMAGE_DEVSERVER_MANIFEST)**"$(END)))
434-
echo $(shell ./travis-build-scripts/create-manifest-list.sh -r $(MQ_DELIVERY_REGISTRY_HOSTNAME) -n $(MQ_DELIVERY_REGISTRY_NAMESPACE) -i $(MQ_IMAGE_DEVSERVER) -t $(MQ_MANIFEST_TAG_CACHED) -u $(MQ_ARCHIVE_REPOSITORY_USER) -p $(MQ_ARCHIVE_REPOSITORY_CREDENTIAL) -d "$(MQ_IMAGE_DEVSERVER_AMD64_DIGEST) $(MQ_IMAGE_DEVSERVER_S390X_DIGEST)" $(END))
425+
echo $(shell ./travis-build-scripts/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)" $(END))
435426
endif
436427
$(info $(shell printf "** Calling script to create fat-manifest for $(MQ_IMAGE_ADVANCEDSERVER_MANIFEST)**"$(END)))
437-
echo $(shell ./travis-build-scripts/create-manifest-list.sh -r $(MQ_DELIVERY_REGISTRY_HOSTNAME) -n $(MQ_DELIVERY_REGISTRY_NAMESPACE) -i $(MQ_IMAGE_ADVANCEDSERVER) -t $(MQ_MANIFEST_TAG_CACHED) -u $(MQ_ARCHIVE_REPOSITORY_USER) -p $(MQ_ARCHIVE_REPOSITORY_CREDENTIAL) -d "$(MQ_IMAGE_ADVANCEDSERVER_AMD64_DIGEST) $(MQ_IMAGE_ADVANCEDSERVER_S390X_DIGEST)" $(END))
428+
echo $(shell ./travis-build-scripts/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)" $(END))
438429

439430
.PHONY: build-skopeo-container
440431
build-skopeo-container:

0 commit comments

Comments
 (0)