From: Trevor Bramwell Date: Tue, 14 May 2019 16:44:13 +0000 (+0000) Subject: Merge "Create Stable Branch Jobs for barometer" X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=3663d726c3821e63d9f5cd4a4736a11680534199;hp=0b399c61dde570aa8492aca1f22a6713b4d34f8d;p=releng.git Merge "Create Stable Branch Jobs for barometer" --- diff --git a/jjb/ci_gate_security/opnfv-ci-gate-security.yaml b/jjb/ci_gate_security/opnfv-ci-gate-security.yaml index ecdb9a16e..af88dd54e 100644 --- a/jjb/ci_gate_security/opnfv-ci-gate-security.yaml +++ b/jjb/ci_gate_security/opnfv-ci-gate-security.yaml @@ -35,7 +35,6 @@ - enfv - fds - fuel - - functest - ipv6 - joid - kvmfornfv @@ -154,7 +153,7 @@ comment-contains-value: 'recheck' projects: - project-compare-type: 'REG_EXP' - project-pattern: 'apex|armband|bamboo|barometer|bottlenecks|calipso|compass4nfv|conductor|cperf|daisy|doctor|dovetail|dpacc|enfv|fds|fuel|functest|pharos|releng|sandbox|yardstick|infra|ipv6|kvmfornfv|models|moon|netready' + project-pattern: 'apex|armband|bamboo|barometer|bottlenecks|calipso|compass4nfv|conductor|cperf|daisy|doctor|dovetail|dpacc|enfv|fds|fuel|pharos|releng|sandbox|yardstick|infra|ipv6|kvmfornfv|models|moon|netready' branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' diff --git a/jjb/fuel/fuel-daily-jobs.yaml b/jjb/fuel/fuel-daily-jobs.yaml index 96e65fbca..36de6fda7 100644 --- a/jjb/fuel/fuel-daily-jobs.yaml +++ b/jjb/fuel/fuel-daily-jobs.yaml @@ -345,7 +345,7 @@ - trigger: name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-hunter-trigger' triggers: - - timed: '0 20 * * 1,2,4,6,7' + - timed: '0 20 * * 1,4,7' - trigger: name: 'fuel-os-odl-nofeature-ha-baremetal-daily-hunter-trigger' triggers: @@ -382,11 +382,11 @@ - trigger: name: 'fuel-os-ovn-nofeature-noha-baremetal-daily-hunter-trigger' triggers: - - timed: '' + - timed: '0 20 * * 6' - trigger: name: 'fuel-os-odl-ovs-noha-baremetal-daily-hunter-trigger' triggers: - - timed: '' + - timed: '0 20 * * 2' - trigger: name: 'fuel-os-nosdn-ovs-noha-baremetal-daily-hunter-trigger' triggers: diff --git a/jjb/functest/functest-daily-jobs.yaml b/jjb/functest/functest-daily-jobs.yaml index 1a94d5140..45f1e0553 100644 --- a/jjb/functest/functest-daily-jobs.yaml +++ b/jjb/functest/functest-daily-jobs.yaml @@ -66,6 +66,14 @@ slave-label: apex-baremetal-master installer: apex <<: *master + - virtual: + slave-label: apex-virtual-master + installer: apex + <<: *hunter + - baremetal: + slave-label: apex-baremetal-master + installer: apex + <<: *hunter - virtual: slave-label: apex-virtual-master installer: apex diff --git a/jjb/functest/functest-rtd-jobs.yaml b/jjb/functest/functest-rtd-jobs.yaml index 785bd3543..b145ca7c2 100644 --- a/jjb/functest/functest-rtd-jobs.yaml +++ b/jjb/functest/functest-rtd-jobs.yaml @@ -13,6 +13,9 @@ - master: branch: '{stream}' disabled: false + - iruya: + branch: 'stable/{stream}' + disabled: false - gambia: branch: 'stable/{stream}' disabled: false diff --git a/jjb/opnfvdocs/docs-rtd.yaml b/jjb/opnfvdocs/docs-rtd.yaml index a8d29e4b4..8906dfdee 100644 --- a/jjb/opnfvdocs/docs-rtd.yaml +++ b/jjb/opnfvdocs/docs-rtd.yaml @@ -1,7 +1,13 @@ --- - project: name: docs-rtd + project: 'opnfvdocs' + project-name: 'opnfvdocs' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfvdocsdemo/79560/' + rtd-token: 'a96c3622a270344cf9bf3f73b0dfa04f59fc59c0' + project-pattern: 'opnfvdocs' jobs: + - '{project-name}-rtd-jobs' - 'docs-merge-rtd-{stream}' - 'docs-verify-rtd-{stream}' @@ -15,10 +21,6 @@ - danube: branch: 'stable/{stream}' - project: 'opnfvdocs' - rtdproject: 'opnfv' - # TODO: Archive Artifacts - - job-template: name: 'docs-merge-rtd-{stream}' @@ -43,14 +45,6 @@ builders: - 'remove-old-docs-from-opnfv-artifacts' - - shell: | - if [ $GERRIT_BRANCH == "master" ]; then - RTD_BUILD_VERSION=latest - else - RTD_BUILD_VERSION=${{GERRIT_BRANCH/\//-}} - fi - curl -X POST --data "version_slug=$RTD_BUILD_VERSION" https://readthedocs.org/build/opnfvdocsdemo - - job-template: name: 'docs-verify-rtd-{stream}' diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml index 5b3dae949..08c08ee82 100644 --- a/jjb/releng/opnfv-docker.yaml +++ b/jjb/releng/opnfv-docker.yaml @@ -377,7 +377,7 @@ # projects with jobs for fraser - 'bottlenecks': project: 'bottlenecks' - <<: *fraser + <<: *hunter <<: *other-receivers - 'clover': project: 'clover' diff --git a/releases/hunter/apex.yaml b/releases/hunter/apex.yaml index a1f47b03f..397f3da84 100644 --- a/releases/hunter/apex.yaml +++ b/releases/hunter/apex.yaml @@ -12,6 +12,11 @@ project-type: installer release-model: stable upstream: https://wiki.openstack.org/wiki/TripleO +releases: + - version: opnfv-8.0.0 + location: + apex: 5a60fc71848a60ee51837b7dc7a49dda741876cd + branches: - name: stable/hunter location: diff --git a/releases/hunter/bottlenecks.yaml b/releases/hunter/bottlenecks.yaml new file mode 100644 index 000000000..43c055352 --- /dev/null +++ b/releases/hunter/bottlenecks.yaml @@ -0,0 +1,14 @@ +--- +project: bottlenecks +project-type: testing +release-model: stable + +branches: + - name: stable/hunter + location: + bottlenecks: 80edaf3c201bec85fe8a403e03b68899c08df3bb + +releases: + - version: opnfv-8.0.0 + location: + bottlenecks: 80edaf3c201bec85fe8a403e03b68899c08df3bb diff --git a/releases/hunter/clover.yaml b/releases/hunter/clover.yaml index 1bc9288b4..f35dde881 100644 --- a/releases/hunter/clover.yaml +++ b/releases/hunter/clover.yaml @@ -3,7 +3,14 @@ project: clover project-type: feature release-model: stable +releases: + - version: opnfv-8.0.0 + location: + clover: 1301c1842b5b678a1c91ce6d81b1df85135186b6 + branches: - name: stable/hunter location: clover: 3f86a3d611f4d2a4f21d9be2a2284ccf120db36e + +release-notes: https://opnfv-clover.readthedocs.io/en/stable-hunter/release/release-notes/release-notes.html diff --git a/releases/hunter/doctor.yaml b/releases/hunter/doctor.yaml index ff16aec3b..1678d8c17 100644 --- a/releases/hunter/doctor.yaml +++ b/releases/hunter/doctor.yaml @@ -11,7 +11,14 @@ project: doctor project-type: feature release-model: stable +releases: + - version: opnfv-8.0.0 + location: + doctor: 3eb8e9800215f25712d62160042e472f63cec1e1 + branches: - name: stable/hunter location: doctor: 73605c5c34b97ab56306bfa9af0f5888f3c7e46d + +release-notes: https://opnfv-doctor.readthedocs.io/en/stable-hunter/release/release-notes/index.html#doctor-releasenotes diff --git a/releases/hunter/fuel.yaml b/releases/hunter/fuel.yaml index a97b97dd9..e1e111fc1 100644 --- a/releases/hunter/fuel.yaml +++ b/releases/hunter/fuel.yaml @@ -16,4 +16,9 @@ branches: location: fuel: f021e19b4797eb4f6830d86056fce919f1e1fe01 +releases: + - version: opnfv-8.0.0 + location: + fuel: 4e64c8495d8cddab653e7b6f8db1d4335755d4c9 + release-notes: https://opnfv-fuel.readthedocs.io/en/latest/release/release-notes/release-notes.html diff --git a/releases/hunter/ipv6.yaml b/releases/hunter/ipv6.yaml index 853823795..819100dab 100644 --- a/releases/hunter/ipv6.yaml +++ b/releases/hunter/ipv6.yaml @@ -11,6 +11,11 @@ project: ipv6 project-type: feature release-model: stable +releases: + - version: opnfv-8.0.0 + location: + ipv6: b113174fa52a1ac4bd20bdbdaea86b07897e7091 + branches: - name: stable/hunter location: diff --git a/releases/hunter/stor4nfv.yaml b/releases/hunter/stor4nfv.yaml index 8d7fb2208..22bff3b21 100644 --- a/releases/hunter/stor4nfv.yaml +++ b/releases/hunter/stor4nfv.yaml @@ -7,3 +7,5 @@ branches: - name: stable/hunter location: stor4nfv: fe427fc3f69ecc5e104a6fdb2c9f5d82f0254fdb + +release-notes: https://opnfv-stor4nfv.readthedocs.io/en/latest/release/release-notes/release-notes.html diff --git a/releases/hunter/yardstick.yaml b/releases/hunter/yardstick.yaml index 88391b09e..f19ec3a55 100644 --- a/releases/hunter/yardstick.yaml +++ b/releases/hunter/yardstick.yaml @@ -7,3 +7,10 @@ branches: - name: stable/hunter location: yardstick: 85899baa90714ae15add21a330316793071168ae + +releases: + - version: opnfv-8.0.0 + location: + yardstick: 9bd54d7914f4c025d4a50611f726d6154f914c7b + +release-notes: https://opnfv-yardstick.readthedocs.io/en/latest/release/release-notes/release-notes.html