diff --git a/.travis.yml b/.travis.yml index a088182c..969e25be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ services: env: global: - - MAIN_BRANCH=private-master + - MAIN_BRANCH=v9.4.1 - TAGCACHE_FILE=tagcache - RELEASE=r1 @@ -40,7 +40,7 @@ jobs: - script: bash -e travis-build-scripts/trigger-release-checks.sh include: - stage: basic-build - if: branch != private-master AND tag IS blank AND branch !~ /^ifix-/ + if: branch != v9.4.1 AND tag IS blank AND branch !~ /^ifix-/ name: "Basic AMD64 build" os: linux env: @@ -50,12 +50,12 @@ jobs: # CD Build - stage: global-tag - if: (branch = private-master OR branch =~ ^ifix-*) AND type != pull_request OR tag =~ ^release-candidate* + if: (branch = v9.4.1 OR branch =~ ^ifix-*) AND type != pull_request OR tag =~ ^release-candidate* name: "Generate Global Tag" os: linux script: bash -e travis-build-scripts/global-tag.sh - stage: build - if: branch = private-master OR tag =~ ^release-candidate* + if: branch = v9.4.1 OR tag =~ ^release-candidate* name: "Multi-Arch AMD64 build" os: linux env: @@ -66,7 +66,7 @@ jobs: - bash travis-build-scripts/travis-log-keepalive.sh & - bash -e travis-build-scripts/run.sh - stage: build - if: branch = private-master OR tag =~ ^release-candidate* + if: branch = v9.4.1 OR tag =~ ^release-candidate* name: "Multi-Arch S390X build" os: linux arch: s390x @@ -80,7 +80,7 @@ jobs: - bash travis-build-scripts/travis-log-keepalive.sh & - bash -e travis-build-scripts/run.sh - stage: build - if: branch = private-master OR tag =~ ^release-candidate* + if: branch = v9.4.1 OR tag =~ ^release-candidate* name: "Multi-Arch PPC64LE build" os: linux arch: ppc64le @@ -94,16 +94,16 @@ jobs: - bash travis-build-scripts/travis-log-keepalive.sh & - bash -e travis-build-scripts/run.sh - stage: push-manifest - if: branch = private-master AND type != pull_request OR tag =~ ^release-candidate* + if: branch = v9.4.1 AND type != pull_request OR tag =~ ^release-candidate* name: "Push Manifest-list to registry" env: - PUSH_MANIFEST_ONLY=true script: bash -e travis-build-scripts/run.sh - stage: trigger-release-checks - if: branch = private-master AND type != pull_request OR tag =~ ^release-candidate* + if: branch = v9.4.1 AND type != pull_request OR tag =~ ^release-candidate* name: "Trigger release-checks build" script: bash -e travis-build-scripts/trigger-release-checks.sh - + # ifix build started - stage: Check-upload-ifix-driver if: branch =~ ^ifix- @@ -170,7 +170,6 @@ jobs: os: linux script: - bash -e travis-build-scripts/manifest-sync.sh - before_install: - make install-build-deps diff --git a/.whitesource b/.whitesource index b7a772de..5d3072b7 100644 --- a/.whitesource +++ b/.whitesource @@ -4,8 +4,7 @@ "configMode": "LOCAL", "baseBranches": [ "private-master", - "v9.3.0.x", - "v9.4.0" + "v9.4.1" ] }, "issueSettings": { diff --git a/source-branch.env b/source-branch.env index b382c047..3cfa6993 100644 --- a/source-branch.env +++ b/source-branch.env @@ -2,6 +2,6 @@ # SOURCE_BRANCH is the repository branch name for this release stream. # It should be updated when a new release fork is created but not for testing of personal builds or pre-fork updates. -SOURCE_BRANCH ?= private-master +SOURCE_BRANCH ?= v9.4.1 ###########################################################################################################################################################