From 17e5760eec026fa4295067222a78fade1095539a Mon Sep 17 00:00:00 2001 From: jenkins-ci Date: Fri, 24 May 2019 14:32:13 -0700 Subject: [PATCH] Create Stable Branch Jobs for container4nfv Change-Id: I2526a7cec3e1084868497ccf6cd41c8a7af9dbe0 Signed-off-by: jenkins-ci Signed-off-by: Trevor Bramwell --- jjb/container4nfv/container4nfv-arm64.yaml | 20 ++++++++------------ jjb/container4nfv/container4nfv-project.yaml | 2 +- jjb/container4nfv/container4nfv-rtd-jobs.yaml | 2 +- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/jjb/container4nfv/container4nfv-arm64.yaml b/jjb/container4nfv/container4nfv-arm64.yaml index c5ba3be1f..04fdd5a1d 100644 --- a/jjb/container4nfv/container4nfv-arm64.yaml +++ b/jjb/container4nfv/container4nfv-arm64.yaml @@ -7,8 +7,8 @@ stream: - master: branch: master - - gambia: - branch: stable/gambia + - hunter: + branch: stable/hunter scenario: - 'k8-multus-nofeature-noha': disabled: false @@ -48,10 +48,8 @@ - 'trigger-deploy-{pod}-{stream}' builders: - - shell: - !include-raw: arm64/compass-build.sh - - shell: - !include-raw: arm64/compass-deploy.sh + - shell: !include-raw: arm64/compass-build.sh + - shell: !include-raw: arm64/compass-deploy.sh - trigger-builds: - project: yardstick-arm64-compass-arm-virtual03-daily-master current-parameters: false @@ -63,8 +61,7 @@ unstable-threshold: 'Failure' - project: functest-compass-arm-virtual-daily-master current-parameters: false - predefined-parameters: - DEPLOY_SCENARIO='k8-nosdn-nofeature-ha' + predefined-parameters: DEPLOY_SCENARIO='k8-nosdn-nofeature-ha' same-node: true block: true block-thresholds: @@ -111,8 +108,7 @@ wipe-workspace: true builders: - - shell: - !include-raw: arm64/deploy-cni.sh + - shell: !include-raw: arm64/deploy-cni.sh - trigger: @@ -120,7 +116,7 @@ triggers: - timed: '0 12 * * *' - trigger: - name: 'trigger-deploy-virtual-gambia' + name: 'trigger-deploy-virtual-hunter' triggers: - timed: '0 18 * * *' - trigger: @@ -128,6 +124,6 @@ triggers: - timed: '0 12 * * *' - trigger: - name: 'trigger-deploy-baremetal-gambia' + name: 'trigger-deploy-baremetal-hunter' triggers: - timed: '0 18 * * *' diff --git a/jjb/container4nfv/container4nfv-project.yaml b/jjb/container4nfv/container4nfv-project.yaml index f1d58da4a..ca286bff7 100644 --- a/jjb/container4nfv/container4nfv-project.yaml +++ b/jjb/container4nfv/container4nfv-project.yaml @@ -18,7 +18,7 @@ branch: '{stream}' gs-pathname: '' disabled: false - - gambia: + - hunter: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false diff --git a/jjb/container4nfv/container4nfv-rtd-jobs.yaml b/jjb/container4nfv/container4nfv-rtd-jobs.yaml index b55f958e5..70512a985 100644 --- a/jjb/container4nfv/container4nfv-rtd-jobs.yaml +++ b/jjb/container4nfv/container4nfv-rtd-jobs.yaml @@ -13,7 +13,7 @@ - master: branch: '{stream}' disabled: false - - gambia: + - hunter: branch: 'stable/{stream}' disabled: false -- 2.16.6