Merge pull request #815 from mq-cloudpak/sdp-fix-travis-issue-v941

Fix travis issues

Author: dselvara1

.travis.yml

@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-dist: bionic
-group: beta
+dist: focal
+group: vpc
 sudo: required
 
 go:
@@ -28,7 +28,6 @@ env:
     - TAGCACHE_FILE=tagcache
     - RELEASE=r1
     - BASE_MQ_LOCKED=false
-    - GO_VERSION="1.22.9"
 
 go_import_path: "github.com/ibm-messaging/mq-container"
 
@@ -46,7 +45,9 @@ jobs:
       os: linux
       env:
         - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_9_4_1_ARCHIVE_REPOSITORY_DEV_AMD64
-      script: bash -e travis-build-scripts/run.sh
+      script:
+        - bash travis-build-scripts/travis-log-keepalive.sh &
+        - bash -e travis-build-scripts/run.sh
 
     # CD Build
 
@@ -175,10 +176,9 @@ jobs:
 
 before_install:
   - make go-install
-  - curl -sL -o ~/bin/gimme https://raw.githubusercontent.com/urfave/gimme/main/gimme
-  - chmod +x ~/bin/gimme
-  - gimme version
-  - eval "$(gimme "$GO_VERSION")"
+  - export PATH=/usr/local/go/bin:$PATH
+  - export GOROOT=/usr/local/go
+  - export GOPATH=$HOME/gopath
   - go env
   - make install-build-deps
   - make install-credential-helper

Makefile

@@ -71,6 +71,8 @@ MQ_DELIVERY_REGISTRY_CREDENTIAL ?=
 LTS ?= false
 # 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.
 VOLUME_MOUNT_OPTIONS ?= :Z
+# Cache path for pushing images
+MQ_BUILD_REGISTRY_PATH = $(MQ_BUILD_REGISTRY_HOSTNAME)/$(MQ_BUILD_REGISTRY_NAMESPACE)/$(TRAVIS_BUILD_ID)
 
 ###############################################################################
 # Other variables
@@ -456,23 +458,51 @@ pull-mq-archive-dev:
 
 .PHONY: push-advancedserver
 push-advancedserver:
-	@if [ $(MQ_DELIVERY_REGISTRY_NAMESPACE) = "master-fake" ]; then\
-		echo "Detected fake master build. Note that the push destination is set to the fake master namespace: $(MQ_DELIVERY_REGISTRY_FULL_PATH)";\
-	fi
-	$(info $(SPACER)$(shell printf $(TITLE)"Push production image to $(MQ_DELIVERY_REGISTRY_FULL_PATH)"$(END)))
+ifndef BUILD_INTERNAL_LEVEL
+	$(info $(SPACER)$(shell printf $(TITLE)"Push production image to cache repository $(MQ_BUILD_REGISTRY_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_BUILD_REGISTRY_PATH)/$(MQ_IMAGE_FULL_RELEASE_NAME)
+	$(COMMAND) push $(MQ_BUILD_REGISTRY_PATH)/$(MQ_IMAGE_FULL_RELEASE_NAME)
+else
+	$(info $(SPACER)$(shell printf $(TITLE)"Push production image to base mq team repository $(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)
+endif
 
 .PHONY: push-devserver
 push-devserver:
-	@if [ $(MQ_DELIVERY_REGISTRY_NAMESPACE) = "master-fake" ]; then\
-		echo "Detected fake master build. Note that the push destination is set to the fake master namespace: $(MQ_DELIVERY_REGISTRY_FULL_PATH)";\
-	fi
-	$(info $(SPACER)$(shell printf $(TITLE)"Push developer image to $(MQ_DELIVERY_REGISTRY_FULL_PATH)"$(END)))
+ifndef BUILD_INTERNAL_LEVEL
+	$(info $(SPACER)$(shell printf $(TITLE)"Push developer image to cache repository $(MQ_BUILD_REGISTRY_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_BUILD_REGISTRY_PATH)/$(MQ_IMAGE_DEV_FULL_RELEASE_NAME)
+	$(COMMAND) push $(MQ_BUILD_REGISTRY_PATH)/$(MQ_IMAGE_DEV_FULL_RELEASE_NAME)
+else
+	$(info $(SPACER)$(shell printf $(TITLE)"Push developer image to base mq team repository $(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)
+endif
+
+.PHONY: promote-devserver
+promote-devserver: build-skopeo-container
+	@if [ $(MQ_DELIVERY_REGISTRY_NAMESPACE) = "master-fake" ]; then\
+		echo "Detected fake master build. Note that the push destination is set to the fake master namespace: $(MQ_DELIVERY_REGISTRY_FULL_PATH)";\
+	fi
+	$(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))
+	$(info $(shell printf "** Determined the built $(MQ_IMAGE_DEV_FULL_RELEASE_NAME) has a digest of $(MQ_IMAGE_DEVSERVER_DIGEST)**"$(END)))
+	@printf $(TITLE)"\nCopying $(MQ_IMAGE_DEV_FULL_RELEASE_NAME) image with digest $(MQ_IMAGE_DEVSERVER_DIGEST) to \"$(MQ_DELIVERY_REGISTRY_HOSTNAME)\"\n"$(END)
+	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)
+
+.PHONY: promote-advancedserver
+promote-advancedserver: build-skopeo-container
+	@if [ $(MQ_DELIVERY_REGISTRY_NAMESPACE) = "master-fake" ]; then\
+		echo "Detected fake master build. Note that the push destination is set to the fake master namespace: $(MQ_DELIVERY_REGISTRY_FULL_PATH)";\
+	fi
+	$(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))
+	$(info $(shell printf "** Determined the built $(MQ_IMAGE_FULL_RELEASE_NAME) has a digest of $(MQ_IMAGE_ADVANCEDSERVER_DIGEST)**"$(END)))
+	@printf $(TITLE)"\nCopying $(MQ_IMAGE_FULL_RELEASE_NAME) image with digest $(MQ_IMAGE_ADVANCEDSERVER_DIGEST) to \"$(MQ_DELIVERY_REGISTRY_HOSTNAME)\"\n"$(END)
+	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)
 
 .PHONY: pull-advancedserver
 pull-advancedserver:
@@ -550,7 +580,7 @@ clean:
 
 .PHONY: go-install
 go-install:
-	GO_VERSION=$(GO_VERSION) ARCH=$(ARCH) ./go-install.sh
+	ARCH=$(ARCH) ./travis-build-scripts/go-install.sh
 
 .PHONY: install-build-deps
 install-build-deps:

travis-build-scripts/artifact-util.sh

@@ -128,7 +128,7 @@ if [ "$DELETE_NAMESPACE" != "true" ]; then
     fi
 fi
 
-REMOTE_PATH="https://${CACHE_PATH}/$TRAVIS_BUILD_ID"
+REMOTE_PATH="https://${CACHE_PATH}/$TRAVIS_BUILD_ID/"
 
 if [ "$CHECK" == "true" ]; then
     printf "${GREENRIGHTARROW} Checking to see if file ${FILE_NAME} exists in repository ${REMOTE_PATH}\n"

travis-build-scripts/build.sh

@@ -62,6 +62,10 @@ if [ -z "$BUILD_INTERNAL_LEVEL" ] ; then
           echo 'Building Production image...' && echo -en 'travis_fold:start:build-advancedserver\\r'
           get_archive_level MQ_ARCHIVE_REPOSITORY
           make build-advancedserver
+          if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
+            make push-advancedserver
+            make push-devserver
+          fi
           echo -en 'travis_fold:end:build-advancedserver\\r'
       fi
   fi
@@ -81,4 +85,4 @@ else
     make build-advancedserver
     echo -en 'travis_fold:end:build-advancedserver\\r'
   fi
-fi
+fi

travis-build-scripts/cleanup-cache.sh

@@ -15,5 +15,5 @@
 # limitations under the License.
 
 echo 'Cleaning up remote cache' && echo -en 'travis_fold:start:cleanup\\r'
-./travis-build-scripts/artifact-util.sh -c ${CACHE_PATH} -u ${REPOSITORY_USER} -p ${REPOSITORY_CREDENTIAL} -f cache/${TAGCACHE_FILE} --delete
-echo -en 'travis_fold:end:cleanup\\r' 
+./travis-build-scripts/artifact-util.sh -c ${CACHE_PATH} -u ${REPOSITORY_USER} -p ${REPOSITORY_CREDENTIAL} --delete-namespace
+echo -en 'travis_fold:end:cleanup\\r'

go-install.sh renamed to travis-build-scripts/go-install.sh

@@ -19,9 +19,10 @@
 
 set -ex
 
-sudo rm -rf /usr/local/go;
+GO_VERSION="1.22.9"
+sudo rm -rf /usr/local/go
 DOWNLOAD_URL="https://go.dev/dl/go${GO_VERSION}.linux-${ARCH}.tar.gz"
 curl -fLo go.tar.gz "${DOWNLOAD_URL}"
 sudo tar -C /usr/local -xzf go.tar.gz
-export PATH=$PATH:/usr/local/go/bin
+export PATH=/usr/local/go/bin:$PATH
 go version

travis-build-scripts/promote.sh

@@ -0,0 +1,54 @@
+#!/bin/bash
+
+# © Copyright IBM Corporation 2019, 2021
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -e
+
+if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
+    echo "Not Promoting as we are a pull request"
+    exit 0
+fi
+
+if [ ! -z $2 ]; then
+    export ARCH=$2
+fi
+
+function promote_developer {
+    echo 'Promoting Developer image...' && echo -en 'travis_fold:start:promote-devserver\\r'
+    make promote-devserver
+    echo -en 'travis_fold:end:promote-devserver\\r'
+}
+
+function promote_production {
+    echo 'Promoting Production image...' && echo -en 'travis_fold:start:promote-advancedserver\\r'
+    make promote-advancedserver
+    echo -en 'travis_fold:end:promote-advancedserver\\r'
+}
+
+# call relevant promote function
+if [ ! -z $1 ]; then
+    case "$1" in
+        developer) promote_developer
+            ;;
+        production) promote_production
+            ;;
+        *) echo "ERROR: Type ( developer | production ) must be passed to promote.sh"
+        exit 1
+        ;;
+    esac
+else
+    echo "ERROR: Type ( developer | production ) must be passed to promote.sh"
+    exit 1
+fi

travis-build-scripts/run.sh

@@ -59,8 +59,8 @@ if [ -z "$BUILD_INTERNAL_LEVEL" ] ; then
       printf '\nNot pushing or writing images to Artifactory because the stream is locked.\n'
       exit 0
     fi
-    ./travis-build-scripts/push.sh developer
-    ./travis-build-scripts/push.sh production
+    ./travis-build-scripts/promote.sh developer
+    ./travis-build-scripts/promote.sh production
   fi
 else
   if [[ "$BUILD_INTERNAL_LEVEL" == *".DE"* ]]; then