Skip to content

Commit cad9186

Browse files
dselvara1GitHub Enterprise
dselvara1
authored and
GitHub Enterprise
committed
Merge pull request #821 from mq-cloudpak/sdp-travis-fix-v940
Fix travis issue
2 parents 04004f6 + 3700a03 commit cad9186

File tree

7 files changed

+56
-100
lines changed

7 files changed

+56
-100
lines changed

‎Makefile‎

Lines changed: 8 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,6 @@ MQ_DELIVERY_REGISTRY_CREDENTIAL ?=
7171
LTS ?= false
7272
# VOLUME_MOUNT_OPTIONS is used when bind-mounting files from the "downloads" directory into the container. By default, SELinux labels are automatically re-written, but this doesn't work on some filesystems with extended attributes (xattrs). You can turn off the label re-writing by setting this variable to be blank.
7373
VOLUME_MOUNT_OPTIONS ?= :Z
74-
# Cache path for pushing images
75-
MQ_BUILD_REGISTRY_PATH = $(MQ_BUILD_REGISTRY_HOSTNAME)/$(MQ_BUILD_REGISTRY_NAMESPACE)/$(TRAVIS_BUILD_ID)
7674

7775
###############################################################################
7876
# Other variables
@@ -443,51 +441,23 @@ pull-mq-archive-dev:
443441

444442
.PHONY: push-advancedserver
445443
push-advancedserver:
446-
ifndef BUILD_INTERNAL_LEVEL
447-
$(info $(SPACER)$(shell printf $(TITLE)"Push production image to cache repository $(MQ_BUILD_REGISTRY_PATH)"$(END)))
448-
$(COMMAND) login $(MQ_DELIVERY_REGISTRY_HOSTNAME) -u $(MQ_DELIVERY_REGISTRY_USER) -p $(MQ_DELIVERY_REGISTRY_CREDENTIAL)
449-
$(COMMAND) tag $(MQ_IMAGE_ADVANCEDSERVER)\:$(MQ_TAG) $(MQ_BUILD_REGISTRY_PATH)/$(MQ_IMAGE_FULL_RELEASE_NAME)
450-
$(COMMAND) push $(MQ_BUILD_REGISTRY_PATH)/$(MQ_IMAGE_FULL_RELEASE_NAME)
451-
else
452-
$(info $(SPACER)$(shell printf $(TITLE)"Push production image to base mq team repository $(MQ_DELIVERY_REGISTRY_FULL_PATH)"$(END)))
444+
@if [ $(MQ_DELIVERY_REGISTRY_NAMESPACE) = "master-fake" ]; then\
445+
echo "Detected fake master build. Note that the push destination is set to the fake master namespace: $(MQ_DELIVERY_REGISTRY_FULL_PATH)";\
446+
fi
447+
$(info $(SPACER)$(shell printf $(TITLE)"Push production image to $(MQ_DELIVERY_REGISTRY_FULL_PATH)"$(END)))
453448
$(COMMAND) login $(MQ_DELIVERY_REGISTRY_HOSTNAME) -u $(MQ_DELIVERY_REGISTRY_USER) -p $(MQ_DELIVERY_REGISTRY_CREDENTIAL)
454449
$(COMMAND) tag $(MQ_IMAGE_ADVANCEDSERVER)\:$(MQ_TAG) $(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_FULL_RELEASE_NAME)
455450
$(COMMAND) push $(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_FULL_RELEASE_NAME)
456-
endif
457451

458452
.PHONY: push-devserver
459453
push-devserver:
460-
ifndef BUILD_INTERNAL_LEVEL
461-
$(info $(SPACER)$(shell printf $(TITLE)"Push developer image to cache repository $(MQ_BUILD_REGISTRY_PATH)"$(END)))
462-
$(COMMAND) login $(MQ_DELIVERY_REGISTRY_HOSTNAME) -u $(MQ_DELIVERY_REGISTRY_USER) -p $(MQ_DELIVERY_REGISTRY_CREDENTIAL)
463-
$(COMMAND) tag $(MQ_IMAGE_DEVSERVER)\:$(MQ_TAG) $(MQ_BUILD_REGISTRY_PATH)/$(MQ_IMAGE_DEV_FULL_RELEASE_NAME)
464-
$(COMMAND) push $(MQ_BUILD_REGISTRY_PATH)/$(MQ_IMAGE_DEV_FULL_RELEASE_NAME)
465-
else
466-
$(info $(SPACER)$(shell printf $(TITLE)"Push developer image to base mq team repository $(MQ_DELIVERY_REGISTRY_FULL_PATH)"$(END)))
467-
$(COMMAND) login $(MQ_DELIVERY_REGISTRY_HOSTNAME) -u $(MQ_DELIVERY_REGISTRY_USER) -p $(MQ_DELIVERY_REGISTRY_CREDENTIAL)
468-
$(COMMAND) tag $(MQ_IMAGE_DEVSERVER)\:$(MQ_TAG) $(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_DEV_FULL_RELEASE_NAME)
469-
$(COMMAND) push $(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_DEV_FULL_RELEASE_NAME)
470-
endif
471-
472-
.PHONY: promote-devserver
473-
promote-devserver: build-skopeo-container
474-
@if [ $(MQ_DELIVERY_REGISTRY_NAMESPACE) = "master-fake" ]; then\
475-
echo "Detected fake master build. Note that the push destination is set to the fake master namespace: $(MQ_DELIVERY_REGISTRY_FULL_PATH)";\
476-
fi
477-
$(eval MQ_IMAGE_DEVSERVER_DIGEST=$(shell $(COMMAND) run skopeo:latest --override-os linux inspect --creds $(MQ_DELIVERY_REGISTRY_USER):$(MQ_DELIVERY_REGISTRY_CREDENTIAL) docker://$(MQ_BUILD_REGISTRY_PATH)/$(MQ_IMAGE_DEV_FULL_RELEASE_NAME) | jq -r .Digest))
478-
$(info $(shell printf "** Determined the built $(MQ_IMAGE_DEV_FULL_RELEASE_NAME) has a digest of $(MQ_IMAGE_DEVSERVER_DIGEST)**"$(END)))
479-
@printf $(TITLE)"\nCopying $(MQ_IMAGE_DEV_FULL_RELEASE_NAME) image with digest $(MQ_IMAGE_DEVSERVER_DIGEST) to \"$(MQ_DELIVERY_REGISTRY_HOSTNAME)\"\n"$(END)
480-
docker run skopeo:latest copy --src-creds $(MQ_DELIVERY_REGISTRY_USER):$(MQ_DELIVERY_REGISTRY_CREDENTIAL) --dest-creds $(MQ_DELIVERY_REGISTRY_USER):$(MQ_DELIVERY_REGISTRY_CREDENTIAL) docker://$(MQ_BUILD_REGISTRY_PATH)/$(MQ_IMAGE_DEVSERVER)@$(MQ_IMAGE_DEVSERVER_DIGEST) docker://$(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_DEV_FULL_RELEASE_NAME)
481-
482-
.PHONY: promote-advancedserver
483-
promote-advancedserver: build-skopeo-container
484454
@if [ $(MQ_DELIVERY_REGISTRY_NAMESPACE) = "master-fake" ]; then\
485455
echo "Detected fake master build. Note that the push destination is set to the fake master namespace: $(MQ_DELIVERY_REGISTRY_FULL_PATH)";\
486456
fi
487-
$(eval MQ_IMAGE_ADVANCEDSERVER_DIGEST=$(shell $(COMMAND) run skopeo:latest --override-os linux inspect --creds $(MQ_DELIVERY_REGISTRY_USER):$(MQ_DELIVERY_REGISTRY_CREDENTIAL) docker://$(MQ_BUILD_REGISTRY_PATH)/$(MQ_IMAGE_FULL_RELEASE_NAME) | jq -r .Digest))
488-
$(info $(shell printf "** Determined the built $(MQ_IMAGE_FULL_RELEASE_NAME) has a digest of $(MQ_IMAGE_ADVANCEDSERVER_DIGEST)**"$(END)))
489-
@printf $(TITLE)"\nCopying $(MQ_IMAGE_FULL_RELEASE_NAME) image with digest $(MQ_IMAGE_ADVANCEDSERVER_DIGEST) to \"$(MQ_DELIVERY_REGISTRY_HOSTNAME)\"\n"$(END)
490-
docker run skopeo:latest copy --src-creds $(MQ_DELIVERY_REGISTRY_USER):$(MQ_DELIVERY_REGISTRY_CREDENTIAL) --dest-creds $(MQ_DELIVERY_REGISTRY_USER):$(MQ_DELIVERY_REGISTRY_CREDENTIAL) docker://$(MQ_BUILD_REGISTRY_PATH)/$(MQ_IMAGE_ADVANCEDSERVER)@$(MQ_IMAGE_ADVANCEDSERVER_DIGEST) docker://$(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_FULL_RELEASE_NAME)
457+
$(info $(SPACER)$(shell printf $(TITLE)"Push developer image to $(MQ_DELIVERY_REGISTRY_FULL_PATH)"$(END)))
458+
$(COMMAND) login $(MQ_DELIVERY_REGISTRY_HOSTNAME) -u $(MQ_DELIVERY_REGISTRY_USER) -p $(MQ_DELIVERY_REGISTRY_CREDENTIAL)
459+
$(COMMAND) tag $(MQ_IMAGE_DEVSERVER)\:$(MQ_TAG) $(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_DEV_FULL_RELEASE_NAME)
460+
$(COMMAND) push $(MQ_DELIVERY_REGISTRY_FULL_PATH)/$(MQ_IMAGE_DEV_FULL_RELEASE_NAME)
491461

492462
.PHONY: pull-advancedserver
493463
pull-advancedserver:

‎travis-build-scripts/artifact-util.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ if [ "$DELETE_NAMESPACE" != "true" ]; then
128128
fi
129129
fi
130130

131-
REMOTE_PATH="https://${CACHE_PATH}/$TRAVIS_BUILD_ID/"
131+
REMOTE_PATH="https://${CACHE_PATH}/$TRAVIS_BUILD_ID"
132132

133133
if [ "$CHECK" == "true" ]; then
134134
printf "${GREENRIGHTARROW} Checking to see if file ${FILE_NAME} exists in repository ${REMOTE_PATH}\n"

‎travis-build-scripts/build.sh‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,6 @@ if [ -z "$BUILD_INTERNAL_LEVEL" ] ; then
6161
echo 'Building Production image...' && echo -en 'travis_fold:start:build-advancedserver\\r'
6262
get_archive_level MQ_ARCHIVE_REPOSITORY
6363
make build-advancedserver
64-
if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
65-
make push-advancedserver
66-
make push-devserver
67-
fi
6864
echo -en 'travis_fold:end:build-advancedserver\\r'
6965
fi
7066
fi

‎travis-build-scripts/cleanup-cache.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515
# limitations under the License.
1616

1717
echo 'Cleaning up remote cache' && echo -en 'travis_fold:start:cleanup\\r'
18-
./travis-build-scripts/artifact-util.sh -c ${CACHE_PATH} -u ${REPOSITORY_USER} -p ${REPOSITORY_CREDENTIAL} --delete-namespace
18+
./travis-build-scripts/artifact-util.sh -c ${CACHE_PATH} -u ${REPOSITORY_USER} -p ${REPOSITORY_CREDENTIAL} -f cache/${TAGCACHE_FILE} --delete
1919
echo -en 'travis_fold:end:cleanup\\r'

‎travis-build-scripts/promote.sh‎

Lines changed: 0 additions & 54 deletions
This file was deleted.

‎travis-build-scripts/reset-credential-pass.sh‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
#!/bin/bash
2+
3+
# © Copyright IBM Corporation 2025
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
17+
set -e
18+
gpg2 --batch --gen-key <<-EOF
19+
%echo generating a standard key
20+
Key-Type: DSA
21+
Key-Length: 1024
22+
Subkey-Type: ELG-E
23+
Subkey-Length: 1024
24+
Name-Real: Travis CI
25+
Name-Email: [email protected]
26+
Expire-Date: 0
27+
Passphrase: $REGISTRY_PASS
28+
%commit
29+
%echo done
30+
EOF
31+
key=$(gpg2 --list-secret-keys | grep uid -B 1 | head -n 1 | sed 's/^ *//g')
32+
pass init $key
33+
pass insert docker-credential-helpers/docker-pass-initialized-check <<-EOF
34+
pass is initialized
35+
pass is initialized
36+
EOF
37+
if [ -f "doc" ] ; then
38+
rm -f doc
39+
fi
40+
gpg2 --passphrase $REGISTRY_PASS --pinentry-mode=loopback --output doc --decrypt ~/.password-store/docker-credential-helpers/docker-pass-initialized-check.gpg

‎travis-build-scripts/run.sh‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,12 @@ if [ -z "$BUILD_INTERNAL_LEVEL" ] ; then
4848
printf '\nNot pushing or writing images to Artifactory because the stream is locked.\n'
4949
exit 0
5050
fi
51-
./travis-build-scripts/promote.sh developer
52-
./travis-build-scripts/promote.sh production
51+
if [ "$ARCH" = "amd64" ] ; then
52+
echo "reset credential helper ..."
53+
./travis-build-scripts/reset-credential-pass.sh
54+
fi
55+
./travis-build-scripts/push.sh developer
56+
./travis-build-scripts/push.sh production
5357
fi
5458
else
5559
if [[ "$BUILD_INTERNAL_LEVEL" == *".DE"* ]]; then

0 commit comments

Comments
 (0)