From: Trevor Bramwell Date: Wed, 9 Dec 2020 18:49:16 +0000 (+0000) Subject: Merge "Create Stable Branch Jobs for vswitchperf" X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=ee3cd626aa1c4cb661c1cd98596b0d5c136ad6d0;hp=fd18d20873d398b901646f1c4f0c43dca3ad1ba1;p=releng.git Merge "Create Stable Branch Jobs for vswitchperf" --- diff --git a/jjb/airship/airship-rtd-jobs.yaml b/jjb/airship/airship-rtd-jobs.yaml index f3af2adfd..d5f920b46 100644 --- a/jjb/airship/airship-rtd-jobs.yaml +++ b/jjb/airship/airship-rtd-jobs.yaml @@ -9,6 +9,9 @@ - master: branch: '{stream}' disabled: false + - jerma: &jerma + branch: 'stable/{stream}' + disabled: false - iruya: branch: 'stable/{stream}' disabled: false diff --git a/jjb/airship/airship.yaml b/jjb/airship/airship.yaml index 825fe1070..8ba231a39 100644 --- a/jjb/airship/airship.yaml +++ b/jjb/airship/airship.yaml @@ -477,7 +477,7 @@ <<: *airship-jobs - name: 'airship-opnfv-functest-smoke-{tag}-refstack_object-run' <<: *airship-jobs - - name: 'airship-opnfv-functest-smoke-{tag}-refstack_plateform-run' + - name: 'airship-opnfv-functest-smoke-{tag}-refstack_platform-run' <<: *airship-jobs - name: 'airship-opnfv-functest-smoke-{tag}-tempest_full-run' <<: *airship-jobs @@ -609,6 +609,8 @@ <<: *airship-jobs - name: 'airship-opnfv-functest-healthcheck-{tag}-cinder_test-run' <<: *airship-jobs + - name: 'airship-opnfv-functest-healthcheck-{tag}-tempest_smoke-run' + <<: *airship-jobs - multijob: name: opnfv/functest-smoke:{functest_tag} projects: diff --git a/jjb/cirv/cirv-hdv-rtd-jobs.yaml b/jjb/cirv/cirv-hdv-rtd-jobs.yaml new file mode 100644 index 000000000..54c007730 --- /dev/null +++ b/jjb/cirv/cirv-hdv-rtd-jobs.yaml @@ -0,0 +1,22 @@ +--- +- project: + name: cirv-hdv-rtd + project: cirv-hdv + project-name: cirv-hdv + + project-pattern: 'cirv-hdv' + # yamllint disable-line rule:line-length + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-cirv-hdv/140801/' + rtd-token: 'f29ff450f15f5c01f89f238320aa33763256bc7c' + + stream: + - master: + branch: '{stream}' + disabled: false + - jerma: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/cirv/cirv-rtd-jobs.yaml b/jjb/cirv/cirv-rtd-jobs.yaml new file mode 100644 index 000000000..2812d9e87 --- /dev/null +++ b/jjb/cirv/cirv-rtd-jobs.yaml @@ -0,0 +1,21 @@ +--- +- project: + name: cirv-rtd + project: cirv + project-name: cirv + + project-pattern: 'cirv' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-cirv/140765/' + rtd-token: 'cec79ce42917b10adb33f0af8aaa9be33eee63d9' + + stream: + - master: + branch: '{stream}' + disabled: false + - jerma: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/cirv/cirv-sdv-rtd-jobs.yaml b/jjb/cirv/cirv-sdv-rtd-jobs.yaml new file mode 100644 index 000000000..2a5cf96c0 --- /dev/null +++ b/jjb/cirv/cirv-sdv-rtd-jobs.yaml @@ -0,0 +1,22 @@ +--- +- project: + name: cirv-sdv-rtd + project: cirv-sdv + project-name: cirv-sdv + + project-pattern: 'cirv-sdv' + # yamllint disable-line rule:line-length + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-cirv-sdv/140800/' + rtd-token: '5ce62cc08e799ac377397d654b62bde0d1dec22d' + + stream: + - master: + branch: '{stream}' + disabled: false + - jerma: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false + + jobs: + - '{project-name}-rtd-jobs' diff --git a/jjb/functest/functest.ovn.yaml b/jjb/functest/functest.ovn.yaml index 52ba2389d..3bd858527 100644 --- a/jjb/functest/functest.ovn.yaml +++ b/jjb/functest/functest.ovn.yaml @@ -494,7 +494,6 @@ - job-template: name: 'functest-ovn-{tag}-daily' - disabled: true project-type: multijob triggers: - timed: '@daily' @@ -810,7 +809,6 @@ - job-template: name: 'functest-ovn-{tag}-check' - disabled: true project-type: multijob parameters: - functest-ovn-slave: 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/opnfvdocs/opnfvdocs.yaml b/jjb/opnfvdocs/opnfvdocs.yaml index fe5d14996..22d67d637 100644 --- a/jjb/opnfvdocs/opnfvdocs.yaml +++ b/jjb/opnfvdocs/opnfvdocs.yaml @@ -39,7 +39,7 @@ name: GIT_CLONE_BASE default: ssh://gerrit.opnfv.org:29418 description: "Used for overriding the GIT URL coming from parameters macro." - - 'opnfv-build-centos-defaults' + - 'opnfv-build-defaults' scm: - git-scm-gerrit @@ -90,7 +90,7 @@ default: '$GS_BASE{gs-pathname}' description: "Directory where the build artifact will be located upon\ \ the completion of the build." - - 'opnfv-build-centos-defaults' + - 'opnfv-build-defaults' scm: - git-scm diff --git a/jjb/releng/opnfv-lint.yaml b/jjb/releng/opnfv-lint.yaml index 6483e3262..dcd262aa5 100644 --- a/jjb/releng/opnfv-lint.yaml +++ b/jjb/releng/opnfv-lint.yaml @@ -47,6 +47,7 @@ description: Slaves to execute yamllint default-slaves: - lf-build1 + - lf-build2 allowed-multiselect: true ignore-offline-nodes: true @@ -96,9 +97,10 @@ branch: '{branch}' - node: name: SLAVE_NAME - description: Slaves to execute yamllint + description: Slaves to execute pylint default-slaves: - lf-build1 + - lf-build2 allowed-multiselect: true ignore-offline-nodes: true @@ -149,6 +151,7 @@ description: Slaves to execute yamllint default-slaves: - lf-build1 + - lf-build2 allowed-multiselect: true ignore-offline-nodes: true 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/airship.yaml b/releases/jerma/airship.yaml index 9b15fe598..22bb2fdca 100644 --- a/releases/jerma/airship.yaml +++ b/releases/jerma/airship.yaml @@ -11,7 +11,14 @@ project: airship project-type: installer release-model: stable +releases: + - version: opnfv-10.0.0 + location: + airship: a9ef2c8eb110daa3a395f7cb118bc5d26c5fca69 + branches: - name: stable/jerma location: airship: 4b2c638c2495be08953c1687ddbe689927d6cd8f + +release-notes: http://docs.opnfv.org/en/stable-jerma/submodules/airship/docs/release/release-notes/release-notes.html 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..57cb08d87 --- /dev/null +++ b/releases/jerma/cirv.yaml @@ -0,0 +1,34 @@ +# SPDX-License-Identifier: Apache-2.0 +############################################################################## +# Copyright (c) 2020 The Linux Foundation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +project: cirv +project-type: testing +release-model: stable + +releases: + - version: opnfv-10.0.0 + location: + cirv: f38765a83c1ba03b5619c1c66ed7bf1a2b6b00be + - version: opnfv-10.0.0 + location: + cirv-hdv: 2d145d4f1fd231def2c9d52a71267031b938c0ac + - version: opnfv-10.0.0 + location: + cirv-sdv: d1cc451f841f995028d57677e897a39229a065a2 + +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/doctor.yaml b/releases/jerma/doctor.yaml index 2c089243a..d28b4e780 100644 --- a/releases/jerma/doctor.yaml +++ b/releases/jerma/doctor.yaml @@ -11,7 +11,14 @@ project: doctor project-type: feature release-model: stable +releases: + - version: opnfv-10.0.0 + location: + doctor: 72a1f8c92f1692f1ea8dcb5bc706ec9939c30e0a + branches: - name: stable/jerma location: doctor: 72a1f8c92f1692f1ea8dcb5bc706ec9939c30e0a + +release-notes: https://opnfv-doctor.readthedocs.io/en/stable-jerma/release/release-notes/index.html 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: