From: Trevor Bramwell Date: Wed, 9 Dec 2020 06:35:49 +0000 (+0000) Subject: Merge "Doctor Jerma tag" X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=3c719e48b88383044c452774d1ae1ebd630e70f1;hp=cbe54922addee0ae7dda699a6bd111071b962095;p=releng.git Merge "Doctor Jerma tag" --- diff --git a/jjb/opnfvdocs/docs-rtd.yaml b/jjb/opnfvdocs/docs-rtd.yaml index fbfa051d3..c3a9660de 100644 --- a/jjb/opnfvdocs/docs-rtd.yaml +++ b/jjb/opnfvdocs/docs-rtd.yaml @@ -25,7 +25,7 @@ parameters: - label: name: SLAVE_LABEL - default: 'lf-build1' + default: 'lf-build2' description: 'Slave label on Jenkins' all-nodes: false node-eligibility: 'ignore-offline' diff --git a/jjb/releng/opnfv-utils.yaml b/jjb/releng/opnfv-utils.yaml index 3dd5ce40a..f85606f7e 100644 --- a/jjb/releng/opnfv-utils.yaml +++ b/jjb/releng/opnfv-utils.yaml @@ -58,7 +58,7 @@ name: SLAVE_NAME description: 'script lives on master node' default-slaves: - - lf-build1 + - lf-build2 allowed-multiselect: false ignore-offline-nodes: true - project-parameter: diff --git a/jjb/releng/releng-release-jobs.yaml b/jjb/releng/releng-release-jobs.yaml index b72e38f50..42a4d29e7 100644 --- a/jjb/releng/releng-release-jobs.yaml +++ b/jjb/releng/releng-release-jobs.yaml @@ -81,9 +81,10 @@ parameters: - node: name: SLAVE_NAME - description: 'Only run merge job on build1' + description: 'Only run merge job on build1 or 2' default-slaves: - lf-build1 + - lf-build2 allowed-multiselect: false ignore-offline-nodes: true - stream-parameter: diff --git a/releases/hunter/vswitchperf.yaml b/releases/hunter/vswitchperf.yaml index f0335f45f..b5053a5c2 100644 --- a/releases/hunter/vswitchperf.yaml +++ b/releases/hunter/vswitchperf.yaml @@ -3,6 +3,11 @@ project: vswitchperf project-type: testing release-model: stable +releases: + - version: opnfv-8.0.0 + location: + vswitchperf: 589639d313c24104b2a27ef16baf716d1d274108 + branches: - name: stable/hunter location: diff --git a/releases/iruya/vswitchperf.yaml b/releases/iruya/vswitchperf.yaml index d81f27e0d..23e0d66c2 100644 --- a/releases/iruya/vswitchperf.yaml +++ b/releases/iruya/vswitchperf.yaml @@ -3,6 +3,11 @@ project: vswitchperf project-type: testing release-model: stable +releases: + - version: opnfv-9.0.0 + location: + vswitchperf: a94395daf8d3312659b56a306ea64960a2cdd64a + branches: - name: stable/iruya location: diff --git a/releases/jerma/barometer.yaml b/releases/jerma/barometer.yaml index 929d31275..742d0a2fb 100644 --- a/releases/jerma/barometer.yaml +++ b/releases/jerma/barometer.yaml @@ -11,6 +11,10 @@ project: barometer project-type: feature release-model: stable +releases: + - version: opnfv-10.0.0 + location: + barometer: 968f66fc2837744dfe8db69d2314cef3f0cb0800 branches: - name: stable/jerma location: diff --git a/releases/jerma/cirv.yaml b/releases/jerma/cirv.yaml new file mode 100644 index 000000000..c16fbea46 --- /dev/null +++ b/releases/jerma/cirv.yaml @@ -0,0 +1,15 @@ +--- +project: cirv +project-type: testing +release-model: stable + +branches: + - name: stable/jerma + location: + cirv: f38765a83c1ba03b5619c1c66ed7bf1a2b6b00be + - name: stable/jerma + location: + cirv-hdv: 2d145d4f1fd231def2c9d52a71267031b938c0ac + - name: stable/jerma + location: + cirv-sdv: d1cc451f841f995028d57677e897a39229a065a2 diff --git a/releases/jerma/vswitchperf.yaml b/releases/jerma/vswitchperf.yaml index bfa3aacfd..ddb6c4050 100644 --- a/releases/jerma/vswitchperf.yaml +++ b/releases/jerma/vswitchperf.yaml @@ -3,6 +3,11 @@ project: vswitchperf project-type: testing release-model: stable +releases: + - version: opnfv-10.0.0 + location: + vswitchperf: 90ef48d4342a983c7733b8c21bb902d1dab2685a + branches: - name: stable/jerma location: