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

Setup native-ha branch as main branch

Browse Source
This commit is contained in:
Luke Powlett
2020-12-16 17:03:13 +00:00
parent 68fe4a1dc1
commit e1c96655b1
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
.travis.yml
View File

@@ -25,7 +25,7 @@ services:
env: env:
global: global:
- MAIN_BRANCH=private-master - MAIN_BRANCH=native-ha
- MQ_LTS_VERSION=9.2.0.1 - MQ_LTS_VERSION=9.2.0.1
- TAGCACHE_FILE=tagcache - TAGCACHE_FILE=tagcache
- RELEASE=r1 - RELEASE=r1
@@ -40,7 +40,7 @@ go_import_path: "github.com/ibm-messaging/mq-container"
jobs: jobs:
include: include:
- stage: basic-build - stage: basic-build
if: branch != private-master AND tag IS blank if: branch != native-ha AND tag IS blank
name: "Basic AMD64 build" name: "Basic AMD64 build"
os: linux os: linux
env: env:
@@ -50,12 +50,12 @@ jobs:
# CD Build # CD Build
- stage: global-tag - stage: global-tag
if: branch = private-master AND type != pull_request OR tag =~ ^release-candidate* if: branch = native-ha AND type != pull_request OR tag =~ ^release-candidate*
name: "Generate Global Tag" name: "Generate Global Tag"
os: linux os: linux
script: bash -e travis-build-scripts/global-tag.sh script: bash -e travis-build-scripts/global-tag.sh
- stage: build - stage: build
if: branch = private-master OR tag =~ ^release-candidate* if: branch = native-ha OR tag =~ ^release-candidate*
name: "Multi-Arch AMD64 build" name: "Multi-Arch AMD64 build"
os: linux os: linux
env: env:
@@ -63,7 +63,7 @@ jobs:
- MQ_ARCHIVE_REPOSITORY=$MQ_922_ARCHIVE_REPOSITORY_AMD64 - MQ_ARCHIVE_REPOSITORY=$MQ_922_ARCHIVE_REPOSITORY_AMD64
- MQ_ARCHIVE_REPOSITORY_DEV=$MQ_922_ARCHIVE_REPOSITORY_DEV_AMD64 - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_922_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 =~ ^release-candidate* # - if: branch = native-ha OR tag =~ ^release-candidate*
# name: "Multi-Arch PPC64LE build" # name: "Multi-Arch PPC64LE build"
# os: linux-ppc64le # os: linux-ppc64le
# env: # env:
@@ -73,7 +73,7 @@ jobs:
# - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_922_ARCHIVE_REPOSITORY_DEV_PPC64LE # - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_922_ARCHIVE_REPOSITORY_DEV_PPC64LE
# script: bash -e travis-build-scripts/run.sh # script: bash -e travis-build-scripts/run.sh
- stage: build - stage: build
if: branch = private-master OR tag =~ ^release-candidate* if: branch = native-ha OR tag =~ ^release-candidate*
name: "Multi-Arch S390X build" name: "Multi-Arch S390X build"
os: linux-s390 os: linux-s390
env: env:
@@ -83,7 +83,7 @@ jobs:
- MQ_ARCHIVE_REPOSITORY_DEV=$MQ_922_ARCHIVE_REPOSITORY_DEV_S390X - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_922_ARCHIVE_REPOSITORY_DEV_S390X
script: bash -e travis-build-scripts/run.sh script: bash -e travis-build-scripts/run.sh
- stage: push-manifest - stage: push-manifest
if: branch = private-master AND type != pull_request OR tag =~ ^release-candidate* if: branch = native-ha AND type != pull_request OR tag =~ ^release-candidate*
name: "Push Manifest-list to registry" name: "Push Manifest-list to registry"
env: env:
- PUSH_MANIFEST_ONLY=true - PUSH_MANIFEST_ONLY=true
@@ -92,7 +92,7 @@ jobs:
# LTS Build # LTS Build
- stage: global-tag - stage: global-tag
if: branch = private-master AND type != pull_request OR tag =~ ^release-candidate* if: branch = native-ha AND type != pull_request OR tag =~ ^release-candidate*
name: "Generate Global Tag" name: "Generate Global Tag"
os: linux os: linux
env: env:
@@ -102,7 +102,7 @@ jobs:
- RELEASE=$RELEASE_LTS - RELEASE=$RELEASE_LTS
script: bash -e travis-build-scripts/global-tag.sh script: bash -e travis-build-scripts/global-tag.sh
- stage: build - stage: build
if: branch = private-master OR tag =~ ^release-candidate* if: branch = native-ha OR tag =~ ^release-candidate*
name: "Multi-Arch AMD64 build" name: "Multi-Arch AMD64 build"
os: linux os: linux
env: env:
@@ -113,7 +113,7 @@ jobs:
- RELEASE=$RELEASE_LTS - RELEASE=$RELEASE_LTS
script: bash -e travis-build-scripts/run.sh script: bash -e travis-build-scripts/run.sh
- stage: build - stage: build
if: branch = private-master OR tag =~ ^release-candidate* if: branch = native-ha OR tag =~ ^release-candidate*
name: "Multi-Arch S390X build" name: "Multi-Arch S390X build"
os: linux-s390 os: linux-s390
env: env:
@@ -125,7 +125,7 @@ jobs:
- RELEASE=$RELEASE_LTS - RELEASE=$RELEASE_LTS
script: bash -e travis-build-scripts/run.sh script: bash -e travis-build-scripts/run.sh
- stage: push-manifest - stage: push-manifest
if: branch = private-master AND type != pull_request OR tag =~ ^release-candidate* if: branch = native-ha AND type != pull_request OR tag =~ ^release-candidate*
name: "Push Manifest-list to registry" name: "Push Manifest-list to registry"
env: env:
- LTS=true - LTS=true

2
Makefile
View File

@@ -264,7 +264,7 @@ build-devjmstest:
test-devserver: test/docker/vendor test-devserver: test/docker/vendor
$(info $(SPACER)$(shell printf $(TITLE)"Test $(MQ_IMAGE_DEVSERVER):$(MQ_TAG) on $(shell docker --version)"$(END))) $(info $(SPACER)$(shell printf $(TITLE)"Test $(MQ_IMAGE_DEVSERVER):$(MQ_TAG) on $(shell docker --version)"$(END)))
docker inspect $(MQ_IMAGE_DEVSERVER):$(MQ_TAG) docker inspect $(MQ_IMAGE_DEVSERVER):$(MQ_TAG)
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) cd test/docker && TEST_IMAGE=$(MQ_IMAGE_DEVSERVER):$(MQ_TAG) EXPECTED_LICENSE=Production DEV_JMS_IMAGE=$(DEV_JMS_IMAGE) IBMJRE=true go test -parallel $(NUM_CPU) -timeout $(TEST_TIMEOUT_DOCKER) -tags mqdev $(TEST_OPTS_DOCKER)
.PHONY: coverage .PHONY: coverage
coverage: coverage: