academy/mq-container
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build 9.1.5 production image only until developer auth complete

Browse Source
This commit is contained in:
Luke Powlett
2020-03-24 10:33:07 +00:00
committed by Luke J Powlett
parent d2bc7b2adc
commit 35293e1b46
5 changed files with 43 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
.travis.yml
View File

@@ -51,23 +51,23 @@ jobs:
- MQ_ARCHIVE_REPOSITORY=$MQ_915_ARCHIVE_REPOSITORY_AMD64 - MQ_ARCHIVE_REPOSITORY=$MQ_915_ARCHIVE_REPOSITORY_AMD64
- MQ_ARCHIVE_REPOSITORY_DEV=$MQ_915_ARCHIVE_REPOSITORY_DEV_AMD64 - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_915_ARCHIVE_REPOSITORY_DEV_AMD64
script: bash -e travis-build-scripts/run.sh script: bash -e travis-build-scripts/run.sh
- if: branch = private-master OR tag =~ ^pre-release* # - if: branch = private-master OR tag =~ ^pre-release*
name: "Multi-Arch PPC64LE build" # name: "Multi-Arch PPC64LE build"
os: linux-ppc64le # os: linux-ppc64le
env: # env:
- BUILD_ALL=true # - BUILD_ALL=true
- TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics" # - TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics"
# - MQ_ARCHIVE_REPOSITORY=$MQ_915_ARCHIVE_REPOSITORY_PPC64LE # # - MQ_ARCHIVE_REPOSITORY=$MQ_915_ARCHIVE_REPOSITORY_PPC64LE
- MQ_ARCHIVE_REPOSITORY_DEV=$MQ_915_ARCHIVE_REPOSITORY_DEV_PPC64LE # - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_915_ARCHIVE_REPOSITORY_DEV_PPC64LE
script: bash -e travis-build-scripts/run.sh # script: bash -e travis-build-scripts/run.sh
- if: branch = private-master OR tag =~ ^pre-release* # - if: branch = private-master OR tag =~ ^pre-release*
name: "Multi-Arch S390X build" # name: "Multi-Arch S390X build"
os: linux-s390 # os: linux-s390
env: # env:
- BUILD_ALL=true # - BUILD_ALL=true
- TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics" # - TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics"
# - MQ_ARCHIVE_REPOSITORY=$MQ_915_ARCHIVE_REPOSITORY_S390X # # - MQ_ARCHIVE_REPOSITORY=$MQ_915_ARCHIVE_REPOSITORY_S390X
- MQ_ARCHIVE_REPOSITORY_DEV=$MQ_915_ARCHIVE_REPOSITORY_DEV_S390X # - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_915_ARCHIVE_REPOSITORY_DEV_S390X
script: bash -e travis-build-scripts/run.sh script: bash -e travis-build-scripts/run.sh
- stage: deploy - stage: deploy
name: "Pre-release deploy" name: "Pre-release deploy"

13
travis-build-scripts/build.sh
View File

@@ -16,12 +16,13 @@
set -e set -e
echo 'Building Developer JMS test image...' && echo -en 'travis_fold:start:build-devjmstest\\r' ## BUILD PRODUCTION ONLY UNTIL DEV AUTH CONFIG COMPLETE
make build-devjmstest # echo 'Building Developer JMS test image...' && echo -en 'travis_fold:start:build-devjmstest\\r'
echo -en 'travis_fold:end:build-devjmstest\\r' # make build-devjmstest
echo 'Building Developer image...' && echo -en 'travis_fold:start:build-devserver\\r' # echo -en 'travis_fold:end:build-devjmstest\\r'
make build-devserver # echo 'Building Developer image...' && echo -en 'travis_fold:start:build-devserver\\r'
echo -en 'travis_fold:end:build-devserver\\r' # make build-devserver
# echo -en 'travis_fold:end:build-devserver\\r'
if [ "$BUILD_ALL" = true ] ; then if [ "$BUILD_ALL" = true ] ; then
if [ "$ARCH" = "amd64" ] ; then if [ "$ARCH" = "amd64" ] ; then
echo 'Building Production image...' && echo -en 'travis_fold:start:build-advancedserver\\r' echo 'Building Production image...' && echo -en 'travis_fold:start:build-advancedserver\\r'

24
travis-build-scripts/release.sh
View File

@@ -37,9 +37,10 @@ else
fi fi
## Pull all images from default repository ## Pull all images from default repository
ARCH=amd64 make pull-devserver ## BUILD PRODUCTION ONLY UNTIL DEV AUTH CONFIG COMPLETE
ARCH=ppc64le make pull-devserver # ARCH=amd64 make pull-devserver
ARCH=s390x make pull-devserver # ARCH=ppc64le make pull-devserver
# ARCH=s390x make pull-devserver
ARCH=amd64 make pull-advancedserver ARCH=amd64 make pull-advancedserver
# ARCH=ppc64le make pull-advancedserver # ARCH=ppc64le make pull-advancedserver
@@ -88,16 +89,17 @@ elif [ "$TYPE" = "production" ]; then
# release developer image with fat manifest # release developer image with fat manifest
set_docker_hub set_docker_hub
ARCH=amd64 make push-devserver-dockerhub ## BUILD PRODUCTION ONLY UNTIL DEV AUTH CONFIG COMPLETE
ARCH=ppc64le make push-devserver-dockerhub # ARCH=amd64 make push-devserver-dockerhub
ARCH=s390x make push-devserver-dockerhub # ARCH=ppc64le make push-devserver-dockerhub
# ARCH=s390x make push-devserver-dockerhub
curl -LO https://github.com/estesp/manifest-tool/releases/download/v0.9.0/manifest-tool-linux-amd64 # curl -LO https://github.com/estesp/manifest-tool/releases/download/v0.9.0/manifest-tool-linux-amd64
chmod a+x manifest-tool-linux-amd64 # chmod a+x manifest-tool-linux-amd64
docker login --username $MQ_DOCKERHUB_REGISTRY_USER --password $MQ_DOCKERHUB_REGISTRY_CREDENTIAL # docker login --username $MQ_DOCKERHUB_REGISTRY_USER --password $MQ_DOCKERHUB_REGISTRY_CREDENTIAL
./manifest-tool-linux-amd64 push from-spec manifests/dockerhub/$MANIFEST_FILE # ./manifest-tool-linux-amd64 push from-spec manifests/dockerhub/$MANIFEST_FILE
./manifest-tool-linux-amd64 push from-spec manifests/dockerhub/manifest-latest.yaml # ./manifest-tool-linux-amd64 push from-spec manifests/dockerhub/manifest-latest.yaml
# release production image # release production image
set_production_registry set_production_registry

3
travis-build-scripts/run.sh
View File

@@ -30,7 +30,8 @@ echo -en 'travis_fold:end:docker-downgrade\\r'
## Push images ## Push images
if [ "$BUILD_ALL" = true ] ; then if [ "$BUILD_ALL" = true ] ; then
./travis-build-scripts/push.sh developer ## BUILD PRODUCTION ONLY UNTIL DEV AUTH CONFIG COMPLETE
# ./travis-build-scripts/push.sh developer
./travis-build-scripts/push.sh production ./travis-build-scripts/push.sh production
fi fi

7
travis-build-scripts/test.sh
View File

@@ -16,9 +16,10 @@
set -e set -e
echo 'Testing Developer image...' && echo -en 'travis_fold:start:test-devserver\\r' ## BUILD PRODUCTION ONLY UNTIL DEV AUTH CONFIG COMPLETE
make test-devserver # echo 'Testing Developer image...' && echo -en 'travis_fold:start:test-devserver\\r'
echo -en 'travis_fold:end:test-devserver\\r' # make test-devserver
# echo -en 'travis_fold:end:test-devserver\\r'
if [ "$BUILD_ALL" = true ] ; then if [ "$BUILD_ALL" = true ] ; then
if [ "$ARCH" = "amd64" ] ; then if [ "$ARCH" = "amd64" ] ; then
echo 'Testing Production image...' && echo -en 'travis_fold:start:test-advancedserver\\r' echo 'Testing Production image...' && echo -en 'travis_fold:start:test-advancedserver\\r'