From: Aric Gardner Date: Fri, 10 May 2019 18:58:19 +0000 (+0000) Subject: Merge "Doctor hunter release" X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=86365c2d9124cf9c9b5e8fbfa1013fda6299494d;hp=940713e04a28f09bdd6e18e0a723dc450efa9d1c;p=releng.git Merge "Doctor hunter release" --- 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-k8.sh b/jjb/functest/functest-k8.sh index 44f6d6ca6..4543f7f01 100755 --- a/jjb/functest/functest-k8.sh +++ b/jjb/functest/functest-k8.sh @@ -4,10 +4,11 @@ set -e set +u set +o pipefail -[[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null" +redirect="/dev/stdout" FUNCTEST_DIR=/home/opnfv/functest admin_conf_file_vol="-v ${HOME}/admin.conf:/root/.kube/config" +cat ${HOME}/admin.conf dir_result="${HOME}/opnfv/functest/results/${BRANCH##*/}" mkdir -p ${dir_result} 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/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/opnfvdocs.yaml b/releases/hunter/opnfvdocs.yaml new file mode 100644 index 000000000..7853e028c --- /dev/null +++ b/releases/hunter/opnfvdocs.yaml @@ -0,0 +1,9 @@ +--- +project: opnfvdocs +project-type: infra +release-model: stable + +branches: + - name: stable/hunter + location: + opnfvdocs: e834a1712a717d6ab5f66d3c2b56e39f07f55f68 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