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

Re-enable multi-arch dev build/release

Browse Source
This commit is contained in:
Luke Powlett
2020-03-30 09:27:32 +01:00
committed by Luke J Powlett
parent c8de2df2cf
commit 1bb39bc9fd
2 changed files with 31 additions and 33 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"

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

@@ -36,11 +36,10 @@ else
exit 1 exit 1
fi fi
## Pull all images from default repository # Pull all images from default repository
## BUILD PRODUCTION ONLY UNTIL DEV AUTH CONFIG COMPLETE ARCH=amd64 make pull-devserver
# ARCH=amd64 make pull-devserver ARCH=ppc64le make pull-devserver
# ARCH=ppc64le make pull-devserver ARCH=s390x 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
@@ -83,23 +82,22 @@ elif [ "$TYPE" = "production" ]; then
set_staging_registry set_staging_registry
ARCH=amd64 make pull-advancedserver ARCH=amd64 make pull-advancedserver
# ARCH=ppc64le make pull-advancedserver ARCH=ppc64le make pull-advancedserver
# ARCH=s390x make pull-advancedserver ARCH=s390x make pull-advancedserver
# release developer image with fat manifest # release developer image with fat manifest
set_docker_hub set_docker_hub
## BUILD PRODUCTION ONLY UNTIL DEV AUTH CONFIG COMPLETE ARCH=amd64 make push-devserver-dockerhub
# ARCH=amd64 make push-devserver-dockerhub ARCH=ppc64le make push-devserver-dockerhub
# ARCH=ppc64le make push-devserver-dockerhub ARCH=s390x 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