From: Trevor Bramwell Date: Thu, 5 Apr 2018 16:29:41 +0000 (+0000) Subject: Merge "Create Stable Branch Jobs for sfc" X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=30d28af772d4da598ccfd608b9ac24561de60f8c;hp=52908e831d33b6d2f22c96b7583eb00ef630ee9d;p=releng.git Merge "Create Stable Branch Jobs for sfc" --- diff --git a/jjb/apex/apex-fetch-logs.sh b/jjb/apex/apex-fetch-logs.sh new file mode 100755 index 000000000..f25f456b1 --- /dev/null +++ b/jjb/apex/apex-fetch-logs.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash +set -o errexit +set -o nounset +set -o pipefail + +# log info to console +echo "Fetching logs from overcloud. This could take some time..." +echo "--------------------------------------------------------" +echo + +if sudo opnfv-pyutil --fetch-logs; then + LOG_LOCATION=$(cat apex_util.log | grep 'Log retrieval complete' | grep -Eo '/tmp/.+$') + if [ -z "$LOG_LOCATION" ]; then + echo "WARNING: Unable to determine log location. Logs will not be uploaded" + exit 0 + else + UPLOAD_LOCATION="${GS_URL}/logs/${JOB_NAME}/${BUILD_NUMBER}/" + gsutil cp -r ${LOG_LOCATION} gs://${UPLOAD_LOCATION} > gsutil.latest_logs.log + echo "Logs available at https://${UPLOAD_LOCATION}/$(basename $LOG_LOCATION)" + fi +else + echo "WARNING: Log retrieval failed. No logs will be uploaded" + exit 0 +fi diff --git a/jjb/apex/apex-project-jobs.yml b/jjb/apex/apex-project-jobs.yml index 58072865d..700ff60e8 100644 --- a/jjb/apex/apex-project-jobs.yml +++ b/jjb/apex/apex-project-jobs.yml @@ -9,6 +9,11 @@ gs-pathname: '' concurrent-builds: 3 disabled: false + - fraser: &fraser + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + concurrent-builds: 3 + disabled: false - euphrates: &euphrates branch: 'stable/euphrates' gs-pathname: '/euphrates' diff --git a/jjb/apex/apex-verify-jobs.yml b/jjb/apex/apex-verify-jobs.yml index 302932246..6f49ffd78 100644 --- a/jjb/apex/apex-verify-jobs.yml +++ b/jjb/apex/apex-verify-jobs.yml @@ -12,6 +12,11 @@ gs-pathname: '' verify-scenario: 'os-odl-nofeature-ha' disabled: false + - fraser: &fraser + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + verify-scenario: 'os-odl-nofeature-ha' + disabled: false - danube: &danube branch: 'stable/{stream}' gs-pathname: '/{stream}' @@ -27,7 +32,7 @@ - job-template: name: 'apex-verify-unit-tests-{stream}' - node: 'apex-build-{stream}' + node: 'apex-build-master' concurrent: true @@ -353,6 +358,20 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false + - multijob: + name: apex-fetch-logs + condition: ALWAYS + projects: + - name: 'apex-fetch-logs-{stream}' + current-parameters: true + predefined-parameters: | + GERRIT_BRANCH=$GERRIT_BRANCH + GERRIT_REFSPEC=$GERRIT_REFSPEC + GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER + node-parameters: true + kill-phase-on: NEVER + abort-all-job: true + git-revision: false ######################## # builder macros diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 428835683..ed7ba7544 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -28,6 +28,16 @@ scenario_stream: 'master' disable_daily: false disable_promote: false + - fraser: &fraser + branch: 'stable/fraser' + gs-pathname: '/fraser' + build-slave: 'apex-build-master' + virtual-slave: 'apex-virtual-master' + baremetal-slave: 'apex-baremetal-master' + verify-scenario: 'os-odl-nofeature-ha' + scenario_stream: 'fraser' + disable_daily: true + disable_promote: true - euphrates: &euphrates branch: 'stable/euphrates' gs-pathname: '/euphrates' @@ -51,6 +61,42 @@ disable_promote: true scenario: + - 'os-nosdn-nofeature-noha': + <<: *fraser + - 'os-nosdn-nofeature-ha': + <<: *fraser + - 'os-odl-nofeature-ha': + <<: *fraser + - 'os-odl-nofeature-noha': + <<: *fraser + - 'os-odl-bgpvpn-ha': + <<: *fraser + - 'os-ovn-nofeature-noha': + <<: *fraser + - 'os-nosdn-fdio-noha': + <<: *fraser + - 'os-nosdn-fdio-ha': + <<: *fraser + - 'os-nosdn-bar-ha': + <<: *fraser + - 'os-nosdn-bar-noha': + <<: *fraser + - 'os-nosdn-nofeature-ha-ipv6': + <<: *fraser + - 'os-nosdn-ovs_dpdk-noha': + <<: *fraser + - 'os-nosdn-ovs_dpdk-ha': + <<: *fraser + - 'os-nosdn-kvm_ovs_dpdk-noha': + <<: *fraser + - 'os-nosdn-kvm_ovs_dpdk-ha': + <<: *fraser + - 'os-odl-sfc-noha': + <<: *fraser + - 'os-odl-sfc-ha': + <<: *fraser + - 'os-nosdn-calipso-noha': + <<: *fraser - 'os-nosdn-nofeature-noha': <<: *danube - 'os-nosdn-nofeature-ha': @@ -188,6 +234,35 @@ - 'pike' - 'queens' - 'master' + + +# Fetch Logs Job +- job-template: + name: 'apex-fetch-logs-{stream}' + + concurrent: true + + disabled: false + scm: + - git-scm-gerrit + parameters: + - '{project}-{platform}-{stream}-defaults' + - project-parameter: + project: '{project}' + branch: '{branch}' + - apex-parameter: + gs-pathname: '{gs-pathname}' + # yamllint enable rule:line-length + properties: + - logrotate-default + - throttle: + max-per-node: 1 + max-total: 10 + option: 'project' + + builders: + - 'apex-fetch-logs' + - job-template: name: 'apex-runner-cperf-{stream}' @@ -396,6 +471,21 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false + - multijob: + name: apex-fetch-logs + condition: ALWAYS + projects: + - name: 'apex-fetch-logs-{stream}' + current-parameters: false + predefined-parameters: | + GERRIT_BRANCH=$GERRIT_BRANCH + GERRIT_REFSPEC=$GERRIT_REFSPEC + GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER + GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE + node-parameters: true + kill-phase-on: NEVER + abort-all-job: true + git-revision: false # Baremetal Deploy and Test - job-template: @@ -466,7 +556,19 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - + - multijob: + name: apex-fetch-logs + condition: ALWAYS + projects: + - name: 'apex-fetch-logs' + current-parameters: true + predefined-parameters: | + GERRIT_BRANCH=$GERRIT_BRANCH + GERRIT_REFSPEC= + node-parameters: true + kill-phase-on: NEVER + abort-all-job: true + git-revision: false publishers: - groovy-postbuild: script: @@ -1071,6 +1173,159 @@ # builder macros ######################## +# fraser Builder +- builder: + name: apex-builder-fraser + builders: + - multijob: + name: Baremetal Deploy and Test Phase + condition: SUCCESSFUL + projects: + - name: 'apex-os-nosdn-nofeature-noha-baremetal-fraser' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-nosdn-nofeature-ha-baremetal-fraser' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-odl-nofeature-ha-baremetal-fraser' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-odl-nofeature-noha-baremetal-fraser' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-odl-bgpvpn-ha-baremetal-fraser' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-ovn-nofeature-noha-baremetal-fraser' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-nosdn-fdio-noha-baremetal-fraser' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-nosdn-fdio-ha-baremetal-fraser' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-nosdn-bar-ha-baremetal-fraser' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-nosdn-bar-noha-baremetal-fraser' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-nosdn-nofeature-ha-ipv6-baremetal-fraser' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-nosdn-ovs_dpdk-noha-baremetal-fraser' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-nosdn-ovs_dpdk-ha-baremetal-fraser' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-nosdn-kvm_ovs_dpdk-noha-baremetal-fraser' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-nosdn-kvm_ovs_dpdk-ha-baremetal-fraser' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-odl-sfc-noha-baremetal-fraser' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-odl-sfc-ha-baremetal-fraser' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-nosdn-calipso-noha-baremetal-fraser' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + # danube Builder - builder: name: apex-builder-danube @@ -1627,6 +1882,12 @@ - shell: !include-raw: ./apex-deploy.sh +- builder: + name: 'apex-fetch-logs' + builders: + - shell: + !include-raw: ./apex-fetch-logs.sh + ####################### # trigger macros ######################## @@ -1635,6 +1896,11 @@ triggers: - timed: '0 0 1-31/2 * *' +- trigger: + name: 'apex-fraser' + triggers: + - timed: '0 0 2-30/2 * *' + - trigger: name: 'apex-euphrates' triggers: diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2 index 0bedd3560..b0fc0d451 100644 --- a/jjb/apex/apex.yml.j2 +++ b/jjb/apex/apex.yml.j2 @@ -28,6 +28,16 @@ scenario_stream: 'master' disable_daily: false disable_promote: false + - fraser: &fraser + branch: 'stable/fraser' + gs-pathname: '/fraser' + build-slave: 'apex-build-master' + virtual-slave: 'apex-virtual-master' + baremetal-slave: 'apex-baremetal-master' + verify-scenario: 'os-odl-nofeature-ha' + scenario_stream: 'fraser' + disable_daily: true + disable_promote: true - euphrates: &euphrates branch: 'stable/euphrates' gs-pathname: '/euphrates' @@ -66,6 +76,35 @@ - 'pike' - 'queens' - 'master' + + +# Fetch Logs Job +- job-template: + name: 'apex-fetch-logs-{stream}' + + concurrent: true + + disabled: false + scm: + - git-scm-gerrit + parameters: + - '{project}-{platform}-{stream}-defaults' + - project-parameter: + project: '{project}' + branch: '{branch}' + - apex-parameter: + gs-pathname: '{gs-pathname}' + # yamllint enable rule:line-length + properties: + - logrotate-default + - throttle: + max-per-node: 1 + max-total: 10 + option: 'project' + + builders: + - 'apex-fetch-logs' + - job-template: name: 'apex-runner-cperf-{stream}' @@ -274,6 +313,21 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false + - multijob: + name: apex-fetch-logs + condition: ALWAYS + projects: + - name: 'apex-fetch-logs-{stream}' + current-parameters: false + predefined-parameters: | + GERRIT_BRANCH=$GERRIT_BRANCH + GERRIT_REFSPEC=$GERRIT_REFSPEC + GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER + GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE + node-parameters: true + kill-phase-on: NEVER + abort-all-job: true + git-revision: false # Baremetal Deploy and Test - job-template: @@ -344,7 +398,19 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - + - multijob: + name: apex-fetch-logs + condition: ALWAYS + projects: + - name: 'apex-fetch-logs' + current-parameters: true + predefined-parameters: | + GERRIT_BRANCH=$GERRIT_BRANCH + GERRIT_REFSPEC= + node-parameters: true + kill-phase-on: NEVER + abort-all-job: true + git-revision: false publishers: - groovy-postbuild: script: @@ -987,6 +1053,12 @@ - shell: !include-raw: ./apex-deploy.sh +- builder: + name: 'apex-fetch-logs' + builders: + - shell: + !include-raw: ./apex-fetch-logs.sh + ####################### # trigger macros ######################## @@ -995,6 +1067,11 @@ triggers: - timed: '0 0 1-31/2 * *' +- trigger: + name: 'apex-fraser' + triggers: + - timed: '0 0 2-30/2 * *' + - trigger: name: 'apex-euphrates' triggers: diff --git a/jjb/apex/scenarios.yaml.hidden b/jjb/apex/scenarios.yaml.hidden index 93ce931eb..58f1c64f4 100644 --- a/jjb/apex/scenarios.yaml.hidden +++ b/jjb/apex/scenarios.yaml.hidden @@ -19,6 +19,25 @@ master: - 'os-odl-sfc-noha' - 'os-odl-sfc-ha' - 'os-nosdn-calipso-noha' +fraser: + - 'os-nosdn-nofeature-noha' + - 'os-nosdn-nofeature-ha' + - 'os-odl-nofeature-ha' + - 'os-odl-nofeature-noha' + - 'os-odl-bgpvpn-ha' + - 'os-ovn-nofeature-noha' + - 'os-nosdn-fdio-noha' + - 'os-nosdn-fdio-ha' + - 'os-nosdn-bar-ha' + - 'os-nosdn-bar-noha' + - 'os-nosdn-nofeature-ha-ipv6' + - 'os-nosdn-ovs_dpdk-noha' + - 'os-nosdn-ovs_dpdk-ha' + - 'os-nosdn-kvm_ovs_dpdk-noha' + - 'os-nosdn-kvm_ovs_dpdk-ha' + - 'os-odl-sfc-noha' + - 'os-odl-sfc-ha' + - 'os-nosdn-calipso-noha' euphrates: - 'os-nosdn-nofeature-noha' - 'os-nosdn-nofeature-ha' diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml index 1c5f14880..c74e3c83d 100644 --- a/jjb/armband/armband-ci-jobs.yml +++ b/jjb/armband/armband-ci-jobs.yml @@ -12,8 +12,8 @@ branch: '{stream}' gs-pathname: '' disabled: false - euphrates: &euphrates - stream: euphrates + fraser: &fraser + stream: fraser branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false @@ -33,16 +33,16 @@ # ------------------------------- # CI POD's # ------------------------------- - # euphrates + # fraser # ------------------------------- pod: # yamllint disable rule:key-duplicates - armband-baremetal: <<: *baremetal - <<: *euphrates + <<: *fraser - armband-virtual: <<: *virtual - <<: *euphrates + <<: *fraser # ------------------------------- # master # ------------------------------- @@ -71,10 +71,6 @@ - 'os-nosdn-nofeature-noha': auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger' - exclude: - - scenario: os-ovn-nofeature-ha - stream: euphrates - jobs: - '{installer}-{scenario}-{pod}-daily-{stream}' - '{installer}-deploy-{pod}-daily-{stream}' @@ -302,24 +298,28 @@ triggers: - timed: '0 1 * * 1,3' # --------------------------------------------------------------------- -# Enea Armband CI Baremetal Triggers running against euphrates branch +# Enea Armband CI Baremetal Triggers running against fraser branch # --------------------------------------------------------------------- - trigger: - name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-euphrates-trigger' + name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-fraser-trigger' triggers: - - timed: '' + - timed: '0 1 * * 4,6' - trigger: - name: 'fuel-os-nosdn-nofeature-noha-armband-baremetal-euphrates-trigger' + name: 'fuel-os-nosdn-nofeature-noha-armband-baremetal-fraser-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl-nofeature-ha-armband-baremetal-euphrates-trigger' + name: 'fuel-os-odl-nofeature-ha-armband-baremetal-fraser-trigger' triggers: - - timed: '' + - timed: '0 1 * * 2,5,7' - trigger: - name: 'fuel-os-nosdn-ovs-ha-armband-baremetal-euphrates-trigger' + name: 'fuel-os-ovn-nofeature-ha-armband-baremetal-fraser-trigger' triggers: - timed: '' +- trigger: + name: 'fuel-os-nosdn-ovs-ha-armband-baremetal-fraser-trigger' + triggers: + - timed: '0 1 * * 1,3' # -------------------------------------------------------------- # Enea Armband CI Virtual Triggers running against master branch @@ -345,21 +345,25 @@ triggers: - timed: '' # ------------------------------------------------------------------- -# Enea Armband CI Virtual Triggers running against euphrates branch +# Enea Armband CI Virtual Triggers running against fraser branch # ------------------------------------------------------------------- - trigger: - name: 'fuel-os-nosdn-nofeature-ha-armband-virtual-euphrates-trigger' + name: 'fuel-os-nosdn-nofeature-ha-armband-virtual-fraser-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-nosdn-nofeature-noha-armband-virtual-fraser-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-nofeature-noha-armband-virtual-euphrates-trigger' + name: 'fuel-os-odl-nofeature-ha-armband-virtual-fraser-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl-nofeature-ha-armband-virtual-euphrates-trigger' + name: 'fuel-os-ovn-nofeature-ha-armband-virtual-fraser-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-ovs-ha-armband-virtual-euphrates-trigger' + name: 'fuel-os-nosdn-ovs-ha-armband-virtual-fraser-trigger' triggers: - timed: '' diff --git a/jjb/armband/armband-verify-jobs.yml b/jjb/armband/armband-verify-jobs.yml index 1ebb7df5c..c800872c7 100644 --- a/jjb/armband/armband-verify-jobs.yml +++ b/jjb/armband/armband-verify-jobs.yml @@ -13,7 +13,7 @@ branch: '{stream}' gs-pathname: '' disabled: false - - euphrates: + - fraser: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false diff --git a/jjb/bottlenecks/bottlenecks-ci-jobs.yml b/jjb/bottlenecks/bottlenecks-ci-jobs.yml index 072117ae3..41b73a290 100644 --- a/jjb/bottlenecks/bottlenecks-ci-jobs.yml +++ b/jjb/bottlenecks/bottlenecks-ci-jobs.yml @@ -19,8 +19,8 @@ gs-packagepath: '/{suite}' # docker tag used for version control docker-tag: 'latest' - euphrates: &euphrates - stream: euphrates + fraser: &fraser + stream: fraser branch: 'stable/{stream}' gs-pathname: '/{stream}' gs-packagepath: '/{stream}/{suite}' @@ -49,12 +49,12 @@ slave-label: compass-baremetal-branch installer: compass auto-trigger-name: 'daily-trigger-disabled' - <<: *euphrates + <<: *fraser - virtual: slave-label: compass-virtual-branch installer: compass auto-trigger-name: 'daily-trigger-disabled' - <<: *euphrates + <<: *fraser # ------------------------------- # None-CI PODs @@ -63,7 +63,7 @@ # slave-label: '{pod}' # installer: joid # auto-trigger-name: 'daily-trigger-disabled' - # <<: *euphrates + # <<: *fraser # - orange-pod2: # slave-label: '{pod}' # installer: joid diff --git a/jjb/bottlenecks/bottlenecks-project-jobs.yml b/jjb/bottlenecks/bottlenecks-project-jobs.yml index 93b2d913c..bebac995b 100644 --- a/jjb/bottlenecks/bottlenecks-project-jobs.yml +++ b/jjb/bottlenecks/bottlenecks-project-jobs.yml @@ -21,6 +21,11 @@ # This is used for different test suite dependent packages storage gs-packagepath: '/{suite}' disabled: false + - fraser: &fraser + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + gs-packagepath: '/{stream}/{suite}' + disabled: false - euphrates: branch: 'stable/{stream}' gs-pathname: '/{stream}' @@ -153,7 +158,8 @@ - string: name: PACKAGE_URL default: http://205.177.226.237:9999/bottlenecks{gs-packagepath}/ - description: "the url where we store the packages used for bottlenecks rubbos" + description: "the url where we store the packages used for bottlenecks\ + \ rubbos" #################################### # builders for bottlenecks project diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index 44cb84d8e..0d5f92c2a 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -14,13 +14,13 @@ ppa-pathname: '/{stream}' disabled: false openstack-version: pike - euphrates: &euphrates - stream: euphrates + fraser: &fraser + stream: fraser branch: 'stable/{stream}' disabled: false gs-pathname: '/{stream}' ppa-pathname: '/{stream}' - openstack-version: ocata + openstack-version: pike danube: &danube stream: danube branch: 'stable/{stream}' @@ -45,11 +45,11 @@ - baremetal: slave-label: compass-baremetal-branch os-version: 'xenial' - <<: *euphrates + <<: *fraser - virtual: slave-label: compass-virtual-branch os-version: 'xenial' - <<: *euphrates + <<: *fraser # ------------------------------- # master # ------------------------------- @@ -69,9 +69,6 @@ - 'os-nosdn-nofeature-ha': disabled: false auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' - - 'os-odl_l2-nofeature-ha': - disabled: false - auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' - 'os-odl_l3-nofeature-ha': disabled: false auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' @@ -386,7 +383,7 @@ !include-raw-escape: ./compass-deploy.sh - conditional-step: condition-kind: regex-match - regex: (danube|euphrates) + regex: (danube|fraser) label: '{stream}' steps: - shell: @@ -485,10 +482,6 @@ name: 'compass-os-nosdn-openo-ha-baremetal-centos-master-trigger' triggers: - timed: '' -- trigger: - name: 'compass-os-odl_l2-nofeature-ha-baremetal-centos-master-trigger' - triggers: - - timed: '' - trigger: name: 'compass-os-odl_l3-nofeature-ha-baremetal-centos-master-trigger' triggers: @@ -582,10 +575,6 @@ name: 'compass-os-nosdn-openo-ha-huawei-pod7-danube-trigger' triggers: - timed: '' -- trigger: - name: 'compass-os-odl_l2-nofeature-ha-huawei-pod7-danube-trigger' - triggers: - - timed: '' # '0 21 * * *' - trigger: name: 'compass-os-odl_l3-nofeature-ha-huawei-pod7-danube-trigger' triggers: @@ -678,10 +667,6 @@ name: 'compass-os-nosdn-openo-ha-baremetal-master-trigger' triggers: - timed: '' -- trigger: - name: 'compass-os-odl_l2-nofeature-ha-baremetal-master-trigger' - triggers: - - timed: '' - trigger: name: 'compass-os-odl_l3-nofeature-ha-baremetal-master-trigger' triggers: @@ -701,7 +686,7 @@ - trigger: name: 'compass-os-odl_l2-moon-ha-baremetal-master-trigger' triggers: - - timed: '0 12 2-30/2 * *' + - timed: '' # '0 12 2-30/2 * *' - trigger: name: 'compass-os-nosdn-kvm-ha-baremetal-master-trigger' triggers: @@ -764,98 +749,94 @@ - timed: '' # ------------------- -# ha-baremetal-euphrates +# ha-baremetal-fraser # ------------------- - trigger: - name: 'compass-os-nosdn-nofeature-ha-baremetal-euphrates-trigger' + name: 'compass-os-nosdn-nofeature-ha-baremetal-fraser-trigger' triggers: - timed: '0 1 1-29/2 * *' - trigger: - name: 'compass-os-nosdn-openo-ha-baremetal-euphrates-trigger' + name: 'compass-os-nosdn-openo-ha-baremetal-fraser-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl_l2-nofeature-ha-baremetal-euphrates-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-odl_l3-nofeature-ha-baremetal-euphrates-trigger' + name: 'compass-os-odl_l3-nofeature-ha-baremetal-fraser-trigger' triggers: - timed: '0 21 2-30/2 * *' - trigger: - name: 'compass-os-onos-nofeature-ha-baremetal-euphrates-trigger' + name: 'compass-os-onos-nofeature-ha-baremetal-fraser-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-ocl-nofeature-ha-baremetal-euphrates-trigger' + name: 'compass-os-ocl-nofeature-ha-baremetal-fraser-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-onos-sfc-ha-baremetal-euphrates-trigger' + name: 'compass-os-onos-sfc-ha-baremetal-fraser-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl_l2-moon-ha-baremetal-euphrates-trigger' + name: 'compass-os-odl_l2-moon-ha-baremetal-fraser-trigger' triggers: - - timed: '0 5 1-29/2 * *' + - timed: '' # '0 5 1-29/2 * *' - trigger: - name: 'compass-os-nosdn-kvm-ha-baremetal-euphrates-trigger' + name: 'compass-os-nosdn-kvm-ha-baremetal-fraser-trigger' triggers: - timed: '0 13 2-30/2 * *' - trigger: - name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-euphrates-trigger' + name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-fraser-trigger' triggers: - timed: '0 9 1-29/2 * *' - trigger: - name: 'compass-k8-nosdn-nofeature-ha-baremetal-euphrates-trigger' + name: 'compass-k8-nosdn-nofeature-ha-baremetal-fraser-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl-sfc-ha-baremetal-euphrates-trigger' + name: 'compass-os-odl-sfc-ha-baremetal-fraser-trigger' triggers: - timed: '0 17 2-30/2 * *' - trigger: - name: 'compass-os-nosdn-bar-ha-baremetal-euphrates-trigger' + name: 'compass-os-nosdn-bar-ha-baremetal-fraser-trigger' triggers: - timed: '0 21 1-29/2 * *' - trigger: - name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-euphrates-trigger' + name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-fraser-trigger' triggers: - timed: '' # --------------------- -# noha-baremetal-euphrates +# noha-baremetal-fraser # --------------------- - trigger: - name: 'compass-os-nosdn-kvm-noha-baremetal-euphrates-trigger' + name: 'compass-os-nosdn-kvm-noha-baremetal-fraser-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-nosdn-nofeature-noha-baremetal-euphrates-trigger' + name: 'compass-os-nosdn-nofeature-noha-baremetal-fraser-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl_l3-nofeature-noha-baremetal-euphrates-trigger' + name: 'compass-os-odl_l3-nofeature-noha-baremetal-fraser-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl_l2-moon-noha-baremetal-euphrates-trigger' + name: 'compass-os-odl_l2-moon-noha-baremetal-fraser-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl-sfc-noha-baremetal-euphrates-trigger' + name: 'compass-os-odl-sfc-noha-baremetal-fraser-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-euphrates-trigger' + name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-fraser-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-nosdn-bar-noha-baremetal-euphrates-trigger' + name: 'compass-os-nosdn-bar-noha-baremetal-fraser-trigger' triggers: - timed: '' - trigger: - name: 'compass-k8-nosdn-stor4nfv-noha-baremetal-euphrates-trigger' + name: 'compass-k8-nosdn-stor4nfv-noha-baremetal-fraser-trigger' triggers: - timed: '' @@ -870,10 +851,6 @@ name: 'compass-os-nosdn-openo-ha-virtual-master-trigger' triggers: - timed: '' -- trigger: - name: 'compass-os-odl_l2-nofeature-ha-virtual-master-trigger' - triggers: - - timed: '' - trigger: name: 'compass-os-odl_l3-nofeature-ha-virtual-master-trigger' triggers: @@ -893,7 +870,7 @@ - trigger: name: 'compass-os-odl_l2-moon-ha-virtual-master-trigger' triggers: - - timed: '30 12 1-29/2 * *' + - timed: '' # '30 12 1-29/2 * *' - trigger: name: 'compass-os-nosdn-kvm-ha-virtual-master-trigger' triggers: @@ -937,7 +914,7 @@ - trigger: name: 'compass-os-odl_l2-moon-noha-virtual-master-trigger' triggers: - - timed: '0 18 2-30/2 * *' + - timed: '' # '0 18 2-30/2 * *' - trigger: name: 'compass-os-odl-sfc-noha-virtual-master-trigger' triggers: @@ -956,97 +933,93 @@ - timed: '0 10 2-30/2 * *' # ----------------- -# ha-virtual-euphrates +# ha-virtual-fraser # ----------------- - trigger: - name: 'compass-os-nosdn-nofeature-ha-virtual-euphrates-trigger' + name: 'compass-os-nosdn-nofeature-ha-virtual-fraser-trigger' triggers: - timed: '0 23 1-29/2 * *' - trigger: - name: 'compass-os-nosdn-openo-ha-virtual-euphrates-trigger' + name: 'compass-os-nosdn-openo-ha-virtual-fraser-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl_l2-nofeature-ha-virtual-euphrates-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-odl_l3-nofeature-ha-virtual-euphrates-trigger' + name: 'compass-os-odl_l3-nofeature-ha-virtual-fraser-trigger' triggers: - timed: '0 22 2-30/2 * *' - trigger: - name: 'compass-os-onos-nofeature-ha-virtual-euphrates-trigger' + name: 'compass-os-onos-nofeature-ha-virtual-fraser-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-ocl-nofeature-ha-virtual-euphrates-trigger' + name: 'compass-os-ocl-nofeature-ha-virtual-fraser-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-onos-sfc-ha-virtual-euphrates-trigger' + name: 'compass-os-onos-sfc-ha-virtual-fraser-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl_l2-moon-ha-virtual-euphrates-trigger' + name: 'compass-os-odl_l2-moon-ha-virtual-fraser-trigger' triggers: - timed: '0 20 1-29/2 * *' - trigger: - name: 'compass-os-nosdn-kvm-ha-virtual-euphrates-trigger' + name: 'compass-os-nosdn-kvm-ha-virtual-fraser-trigger' triggers: - timed: '0 16 2-30/2 * *' - trigger: - name: 'compass-os-nosdn-ovs_dpdk-ha-virtual-euphrates-trigger' + name: 'compass-os-nosdn-ovs_dpdk-ha-virtual-fraser-trigger' triggers: - timed: '0 14 1-29/2 * *' - trigger: - name: 'compass-os-odl-sfc-ha-virtual-euphrates-trigger' + name: 'compass-os-odl-sfc-ha-virtual-fraser-trigger' triggers: - timed: '0 18 2-30/2 * *' - trigger: - name: 'compass-k8-nosdn-nofeature-ha-virtual-euphrates-trigger' + name: 'compass-k8-nosdn-nofeature-ha-virtual-fraser-trigger' triggers: - timed: '5 1 2-30/2 * *' - trigger: - name: 'compass-os-nosdn-bar-ha-virtual-euphrates-trigger' + name: 'compass-os-nosdn-bar-ha-virtual-fraser-trigger' triggers: - timed: '0 19 1-29/2 * *' - trigger: - name: 'compass-k8-nosdn-stor4nfv-ha-virtual-euphrates-trigger' + name: 'compass-k8-nosdn-stor4nfv-ha-virtual-fraser-trigger' triggers: - - timed: '' # '0 14 1-29/2 * *' + - timed: '0 15 1-29/2 * *' # ------------------- -# noha-virtual-euphrates +# noha-virtual-fraser # ------------------- - trigger: - name: 'compass-os-nosdn-kvm-noha-virtual-euphrates-trigger' + name: 'compass-os-nosdn-kvm-noha-virtual-fraser-trigger' triggers: - timed: '0 15 1-29/2 * *' - trigger: - name: 'compass-os-nosdn-nofeature-noha-virtual-euphrates-trigger' + name: 'compass-os-nosdn-nofeature-noha-virtual-fraser-trigger' triggers: - timed: '0 17 2-30/2 * *' - trigger: - name: 'compass-os-odl_l3-nofeature-noha-virtual-euphrates-trigger' + name: 'compass-os-odl_l3-nofeature-noha-virtual-fraser-trigger' triggers: - timed: '0 23 1-29/2 * *' - trigger: - name: 'compass-os-odl_l2-moon-noha-virtual-euphrates-trigger' + name: 'compass-os-odl_l2-moon-noha-virtual-fraser-trigger' triggers: - timed: '0 21 2-30/2 * *' - trigger: - name: 'compass-os-odl-sfc-noha-virtual-euphrates-trigger' + name: 'compass-os-odl-sfc-noha-virtual-fraser-trigger' triggers: - timed: '0 19 1-29/2 * *' - trigger: - name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-euphrates-trigger' + name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-fraser-trigger' triggers: - timed: '0 12 2-30/2 * *' - trigger: - name: 'compass-os-nosdn-bar-noha-virtual-euphrates-trigger' + name: 'compass-os-nosdn-bar-noha-virtual-fraser-trigger' triggers: - timed: '0 12 1-29/2 * *' - trigger: - name: 'compass-k8-nosdn-stor4nfv-noha-virtual-euphrates-trigger' + name: 'compass-k8-nosdn-stor4nfv-noha-virtual-fraser-trigger' triggers: - - timed: '' # '0 12 2-30/2 * *' + - timed: '0 13 2-30/2 * *' diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml index cc2dc5a2f..2eb27a663 100644 --- a/jjb/daisy4nfv/daisy-daily-jobs.yml +++ b/jjb/daisy4nfv/daisy-daily-jobs.yml @@ -20,8 +20,8 @@ branch: '{stream}' disabled: false gs-pathname: '' - euphrates: &euphrates - stream: euphrates + fraser: &fraser + stream: fraser branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false @@ -29,21 +29,22 @@ # ------------------------------- # POD, INSTALLER, AND BRANCH MAPPING # ------------------------------- - # CI PODs - # ------------------------------- pod: + # ------------------------------- + # CI PODs + # ------------------------------- - baremetal: slave-label: daisy-baremetal <<: *master - virtual: slave-label: daisy-virtual <<: *master - # - baremetal: - # slave-label: daisy-baremetal - # <<: *euphrates - # - virtual: - # slave-label: daisy-virtual - # <<: *euphrates + - baremetal: + slave-label: daisy-baremetal + <<: *fraser + - virtual: + slave-label: daisy-virtual + <<: *fraser # ------------------------------- # None-CI PODs # ------------------------------- @@ -53,9 +54,9 @@ - zte-pod9: slave-label: zte-pod9 <<: *master - # ------------------------------- - # None-CI PODs - # ------------------------------- + - zte-pod9: + slave-label: zte-pod9 + <<: *fraser # ------------------------------- # scenarios @@ -191,9 +192,9 @@ use-build-blocker: true blocking-jobs: - 'daisy-kolla-build-.*' - - '{installer}-(build|deploy|test)-daily-(euphrates|master)' - - '{installer}-deploy-(baremetal|virtual|zte-pod9)-daily-(euphrates|master)' - - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod9)-daily-(euphrates|master)' + - '{installer}-(build|deploy|test)-daily-(fraser|master)' + - '{installer}-deploy-(baremetal|virtual|zte-pod9)-daily-(fraser|master)' + - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod9)-daily-(fraser|master)' block-level: 'NODE' parameters: @@ -281,50 +282,50 @@ - timed: '' # ---------------------------------------------- -# Triggers for job running on daisy-baremetal against euphrates branch +# Triggers for job running on daisy-baremetal against fraser branch # ---------------------------------------------- # Basic HA Scenarios - trigger: - name: 'daisy-os-nosdn-nofeature-ha-baremetal-daily-euphrates-trigger' + name: 'daisy-os-nosdn-nofeature-ha-baremetal-daily-fraser-trigger' triggers: - timed: '0 0 * * *' # Basic NOHA Scenarios - trigger: - name: 'daisy-os-nosdn-nofeature-noha-baremetal-daily-euphrates-trigger' + name: 'daisy-os-nosdn-nofeature-noha-baremetal-daily-fraser-trigger' triggers: - timed: '' # ODL Scenarios - trigger: - name: 'daisy-os-odl-nofeature-ha-baremetal-daily-euphrates-trigger' + name: 'daisy-os-odl-nofeature-ha-baremetal-daily-fraser-trigger' triggers: - timed: '0 20 * * *' # ovs_dpdk Scenarios - trigger: - name: 'daisy-os-nosdn-ovs_dpdk-noha-baremetal-daily-euphrates-trigger' + name: 'daisy-os-nosdn-ovs_dpdk-noha-baremetal-daily-fraser-trigger' triggers: - timed: '' # ---------------------------------------------- -# Triggers for job running on daisy-virtual against euphrates branch +# Triggers for job running on daisy-virtual against fraser branch # ---------------------------------------------- # Basic HA Scenarios - trigger: - name: 'daisy-os-nosdn-nofeature-ha-virtual-daily-euphrates-trigger' + name: 'daisy-os-nosdn-nofeature-ha-virtual-daily-fraser-trigger' triggers: - timed: '0 0 * * *' # Basic NOHA Scenarios - trigger: - name: 'daisy-os-nosdn-nofeature-noha-virtual-daily-euphrates-trigger' + name: 'daisy-os-nosdn-nofeature-noha-virtual-daily-fraser-trigger' triggers: - timed: '' # ODL Scenarios - trigger: - name: 'daisy-os-odl-nofeature-ha-virtual-daily-euphrates-trigger' + name: 'daisy-os-odl-nofeature-ha-virtual-daily-fraser-trigger' triggers: - timed: '0 20 * * *' # ovs_dpdk Scenarios - trigger: - name: 'daisy-os-nosdn-ovs_dpdk-noha-virtual-daily-euphrates-trigger' + name: 'daisy-os-nosdn-ovs_dpdk-noha-virtual-daily-fraser-trigger' triggers: - timed: '' @@ -335,7 +336,7 @@ - trigger: name: 'daisy-os-nosdn-ovs_dpdk-noha-zte-pod9-daily-master-trigger' triggers: - - timed: '0 10,20 * * *' + - timed: '0 20 * * *' # Basic HA Scenarios - trigger: name: 'daisy-os-nosdn-nofeature-ha-zte-pod9-daily-master-trigger' @@ -351,3 +352,27 @@ name: 'daisy-os-odl-nofeature-ha-zte-pod9-daily-master-trigger' triggers: - timed: '' + +# ---------------------------------------------- +# ZTE POD9 Triggers running against fraser branch +# ---------------------------------------------- +# ovs_dpdk Scenarios +- trigger: + name: 'daisy-os-nosdn-ovs_dpdk-noha-zte-pod9-daily-fraser-trigger' + triggers: + - timed: '0 10 * * *' +# Basic HA Scenarios +- trigger: + name: 'daisy-os-nosdn-nofeature-ha-zte-pod9-daily-fraser-trigger' + triggers: + - timed: '' +# Basic NOHA Scenarios +- trigger: + name: 'daisy-os-nosdn-nofeature-noha-zte-pod9-daily-fraser-trigger' + triggers: + - timed: '' +# ODL Scenarios +- trigger: + name: 'daisy-os-odl-nofeature-ha-zte-pod9-daily-fraser-trigger' + triggers: + - timed: '' diff --git a/jjb/daisy4nfv/daisy-deploy.sh b/jjb/daisy4nfv/daisy-deploy.sh index f729c380e..ea57ab1b4 100755 --- a/jjb/daisy4nfv/daisy-deploy.sh +++ b/jjb/daisy4nfv/daisy-deploy.sh @@ -27,6 +27,12 @@ else CONFIG_REPO_NAME=pharos fi +if [[ "$BRANCH" =~ "master" ]]; then + DOCTOR_OPT="-d 1" +else + DOCTOR_OPT="" +fi + LABS_DIR=/var/tmp/opnfv-${CONFIG_REPO_NAME} echo "Cloning ${CONFIG_REPO_NAME} repo $BRANCH to $LABS_DIR" @@ -35,7 +41,8 @@ git clone ssh://jenkins-zte@gerrit.opnfv.org:29418/${CONFIG_REPO_NAME} \ --quiet --branch $BRANCH $LABS_DIR DEPLOY_COMMAND="sudo -E ./ci/deploy/deploy.sh -L $LABS_DIR \ - -l $LAB_NAME -p $POD_NAME -B $BRIDGE -s $DEPLOY_SCENARIO" + -l $LAB_NAME -p $POD_NAME -B $BRIDGE -s $DEPLOY_SCENARIO \ + $DOCTOR_OPT" # log info to console echo """ diff --git a/jjb/daisy4nfv/daisy-project-jobs.yml b/jjb/daisy4nfv/daisy-project-jobs.yml index c4edd7738..3ea74a9a8 100644 --- a/jjb/daisy4nfv/daisy-project-jobs.yml +++ b/jjb/daisy4nfv/daisy-project-jobs.yml @@ -21,7 +21,7 @@ branch: '{stream}' gs-pathname: '' disabled: false - - euphrates: + - fraser: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false @@ -94,7 +94,7 @@ - email-jenkins-admins-on-failure - trigger: - name: 'daisy-kolla-build-euphrates-trigger' + name: 'daisy-kolla-build-fraser-trigger' triggers: - timed: '0 0 * * 0' @@ -218,9 +218,9 @@ - build-blocker: use-build-blocker: true blocking-jobs: - - '{installer}-daily-(build|deploy|test)-(euphrates|master)' - - '{installer}-.*-(baremetal|virtual|zte-pod9)-daily-(euphrates|master)' - - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod9)-daily-(euphrates|master)' + - '{installer}-daily-(build|deploy|test)-(fraser|master)' + - '{installer}-.*-(baremetal|virtual|zte-pod9)-daily-(fraser|master)' + - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod9)-daily-(fraser|master)' block-level: 'NODE' scm: diff --git a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml index f304d0b95..3a0a59fc4 100644 --- a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml +++ b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml @@ -19,7 +19,7 @@ branch: '{stream}' gs-pathname: '' disabled: false - - euphrates: + - fraser: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false @@ -60,7 +60,7 @@ - build-blocker: use-build-blocker: true blocking-jobs: - - '{alias}-merge-(master|euphrates)' + - '{alias}-merge-(master|fraser)' block-level: 'NODE' scm: diff --git a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml index 4100990d4..777b67795 100644 --- a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml +++ b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml @@ -16,7 +16,7 @@ branch: '{stream}' gs-pathname: '' disabled: false - - euphrates: + - fraser: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false diff --git a/jjb/fuel/fuel-daily-jobs.yml b/jjb/fuel/fuel-daily-jobs.yml index a198751a8..9c7b5da20 100644 --- a/jjb/fuel/fuel-daily-jobs.yml +++ b/jjb/fuel/fuel-daily-jobs.yml @@ -16,8 +16,8 @@ branch: '{stream}' disabled: false gs-pathname: '' - euphrates: &euphrates - stream: euphrates + fraser: &fraser + stream: fraser branch: 'stable/{stream}' disabled: false gs-pathname: '/{stream}' @@ -40,10 +40,10 @@ <<: *master - baremetal: slave-label: fuel-baremetal - <<: *euphrates + <<: *fraser - virtual: slave-label: fuel-virtual - <<: *euphrates + <<: *fraser # ------------------------------- # None-CI PODs # ------------------------------- @@ -102,15 +102,11 @@ - scenario: os-odl_l2-bgpvpn-ha stream: master - scenario: os-odl_l2-bgpvpn-ha - stream: euphrates + stream: fraser - scenario: os-ovn-nofeature-noha stream: danube - - scenario: os-ovn-nofeature-noha - stream: euphrates - scenario: os-ovn-nofeature-ha stream: danube - - scenario: os-ovn-nofeature-ha - stream: euphrates jobs: - 'fuel-{scenario}-{pod}-daily-{stream}' @@ -445,72 +441,80 @@ triggers: - timed: '' # ---------------------------------------------- -# Triggers for job running on fuel-baremetal against euphrates branch +# Triggers for job running on fuel-baremetal against fraser branch # ---------------------------------------------- # HA Scenarios - trigger: - name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-euphrates-trigger' + name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-fraser-trigger' triggers: - timed: '' # '0 20 * * *' - trigger: - name: 'fuel-os-odl-nofeature-ha-baremetal-daily-euphrates-trigger' + name: 'fuel-os-odl-nofeature-ha-baremetal-daily-fraser-trigger' triggers: - timed: '' # '0 2 * * *' - trigger: - name: 'fuel-os-onos-sfc-ha-baremetal-daily-euphrates-trigger' + name: 'fuel-os-onos-sfc-ha-baremetal-daily-fraser-trigger' triggers: - timed: '' # '0 5 * * *' - trigger: - name: 'fuel-os-onos-nofeature-ha-baremetal-daily-euphrates-trigger' + name: 'fuel-os-ovn-nofeature-ha-baremetal-daily-fraser-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-onos-nofeature-ha-baremetal-daily-fraser-trigger' triggers: - timed: '' # '0 8 * * *' - trigger: - name: 'fuel-os-nosdn-kvm-ha-baremetal-daily-euphrates-trigger' + name: 'fuel-os-nosdn-kvm-ha-baremetal-daily-fraser-trigger' triggers: - timed: '' # '0 17 * * *' - trigger: - name: 'fuel-os-nosdn-ovs-ha-baremetal-daily-euphrates-trigger' + name: 'fuel-os-nosdn-ovs-ha-baremetal-daily-fraser-trigger' triggers: - timed: '' # '0 20 * * *' - trigger: - name: 'fuel-os-nosdn-kvm_ovs_dpdk-ha-baremetal-daily-euphrates-trigger' + name: 'fuel-os-nosdn-kvm_ovs_dpdk-ha-baremetal-daily-fraser-trigger' triggers: - timed: '' # '0 12 * * *' - trigger: - name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-ha-baremetal-daily-euphrates-trigger' + name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-ha-baremetal-daily-fraser-trigger' triggers: - timed: '' # '0 8 * * *' # NOHA Scenarios - trigger: - name: 'fuel-os-nosdn-nofeature-noha-baremetal-daily-euphrates-trigger' + name: 'fuel-os-nosdn-nofeature-noha-baremetal-daily-fraser-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl-nofeature-noha-baremetal-daily-fraser-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl-nofeature-noha-baremetal-daily-euphrates-trigger' + name: 'fuel-os-onos-sfc-noha-baremetal-daily-fraser-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-onos-sfc-noha-baremetal-daily-euphrates-trigger' + name: 'fuel-os-onos-nofeature-noha-baremetal-daily-fraser-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-onos-nofeature-noha-baremetal-daily-euphrates-trigger' + name: 'fuel-os-ovn-nofeature-noha-baremetal-daily-fraser-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-kvm-noha-baremetal-daily-euphrates-trigger' + name: 'fuel-os-nosdn-kvm-noha-baremetal-daily-fraser-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-ovs-noha-baremetal-daily-euphrates-trigger' + name: 'fuel-os-nosdn-ovs-noha-baremetal-daily-fraser-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-kvm_ovs_dpdk-noha-baremetal-daily-euphrates-trigger' + name: 'fuel-os-nosdn-kvm_ovs_dpdk-noha-baremetal-daily-fraser-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-noha-baremetal-daily-euphrates-trigger' + name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-noha-baremetal-daily-fraser-trigger' triggers: - timed: '' # ---------------------------------------------- @@ -590,71 +594,79 @@ triggers: - timed: '' # '30 20 * * *' # ---------------------------------------------- -# Triggers for job running on fuel-virtual against euphrates branch +# Triggers for job running on fuel-virtual against fraser branch # ---------------------------------------------- - trigger: - name: 'fuel-os-nosdn-nofeature-ha-virtual-daily-euphrates-trigger' + name: 'fuel-os-nosdn-nofeature-ha-virtual-daily-fraser-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl-nofeature-ha-virtual-daily-fraser-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl-nofeature-ha-virtual-daily-euphrates-trigger' + name: 'fuel-os-onos-sfc-ha-virtual-daily-fraser-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-onos-sfc-ha-virtual-daily-euphrates-trigger' + name: 'fuel-os-onos-nofeature-ha-virtual-daily-fraser-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-onos-nofeature-ha-virtual-daily-euphrates-trigger' + name: 'fuel-os-ovn-nofeature-ha-virtual-daily-fraser-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-kvm-ha-virtual-daily-euphrates-trigger' + name: 'fuel-os-nosdn-kvm-ha-virtual-daily-fraser-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-ovs-ha-virtual-daily-euphrates-trigger' + name: 'fuel-os-nosdn-ovs-ha-virtual-daily-fraser-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-kvm_ovs_dpdk-ha-virtual-daily-euphrates-trigger' + name: 'fuel-os-nosdn-kvm_ovs_dpdk-ha-virtual-daily-fraser-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-ha-virtual-daily-euphrates-trigger' + name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-ha-virtual-daily-fraser-trigger' triggers: - timed: '' # NOHA Scenarios - trigger: - name: 'fuel-os-nosdn-nofeature-noha-virtual-daily-euphrates-trigger' + name: 'fuel-os-nosdn-nofeature-noha-virtual-daily-fraser-trigger' triggers: - timed: '' # '0 13 * * *' - trigger: - name: 'fuel-os-odl-nofeature-noha-virtual-daily-euphrates-trigger' + name: 'fuel-os-odl-nofeature-noha-virtual-daily-fraser-trigger' triggers: - timed: '' # '0 18 * * *' - trigger: - name: 'fuel-os-onos-sfc-noha-virtual-daily-euphrates-trigger' + name: 'fuel-os-ovn-nofeature-noha-virtual-daily-fraser-trigger' + triggers: + - timed: '5 23 * * *' +- trigger: + name: 'fuel-os-onos-sfc-noha-virtual-daily-fraser-trigger' triggers: - timed: '' # '30 20 * * *' - trigger: - name: 'fuel-os-onos-nofeature-noha-virtual-daily-euphrates-trigger' + name: 'fuel-os-onos-nofeature-noha-virtual-daily-fraser-trigger' triggers: - timed: '' # '0 23 * * *' - trigger: - name: 'fuel-os-nosdn-kvm-noha-virtual-daily-euphrates-trigger' + name: 'fuel-os-nosdn-kvm-noha-virtual-daily-fraser-trigger' triggers: - timed: '' # '30 6 * * *' - trigger: - name: 'fuel-os-nosdn-ovs-noha-virtual-daily-euphrates-trigger' + name: 'fuel-os-nosdn-ovs-noha-virtual-daily-fraser-trigger' triggers: - timed: '' # '0 9 * * *' - trigger: - name: 'fuel-os-nosdn-kvm_ovs_dpdk-noha-virtual-daily-euphrates-trigger' + name: 'fuel-os-nosdn-kvm_ovs_dpdk-noha-virtual-daily-fraser-trigger' triggers: - timed: '' # '0 16 * * *' - trigger: - name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-noha-virtual-daily-euphrates-trigger' + name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-noha-virtual-daily-fraser-trigger' triggers: - timed: '' # '0 20 * * *' # ---------------------------------------------- diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml index 9e890cde7..fc49f6348 100644 --- a/jjb/fuel/fuel-project-jobs.yml +++ b/jjb/fuel/fuel-project-jobs.yml @@ -14,7 +14,7 @@ branch: '{stream}' gs-pathname: '' disabled: false - - euphrates: + - fraser: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false diff --git a/jjb/fuel/fuel-verify-jobs.yml b/jjb/fuel/fuel-verify-jobs.yml index 006b4d809..d81b0ce92 100644 --- a/jjb/fuel/fuel-verify-jobs.yml +++ b/jjb/fuel/fuel-verify-jobs.yml @@ -13,7 +13,7 @@ branch: '{stream}' gs-pathname: '' disabled: false - - euphrates: + - fraser: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false diff --git a/jjb/fuel/fuel-weekly-jobs.yml b/jjb/fuel/fuel-weekly-jobs.yml index f21c58660..459d0d1a7 100644 --- a/jjb/fuel/fuel-weekly-jobs.yml +++ b/jjb/fuel/fuel-weekly-jobs.yml @@ -16,8 +16,8 @@ branch: '{stream}' disabled: false gs-pathname: '' - euphrates: &euphrates - stream: euphrates + fraser: &fraser + stream: fraser branch: 'stable/{stream}' disabled: false gs-pathname: '/{stream}' @@ -35,10 +35,10 @@ <<: *master - baremetal: slave-label: fuel-baremetal - <<: *euphrates + <<: *fraser - virtual: slave-label: fuel-virtual - <<: *euphrates + <<: *fraser # ------------------------------- # scenarios # ------------------------------- diff --git a/jjb/functest/functest-docker.yml b/jjb/functest/functest-docker.yml index 909c7b079..50c7c3816 100644 --- a/jjb/functest/functest-docker.yml +++ b/jjb/functest/functest-docker.yml @@ -12,7 +12,7 @@ - master: branch: '{stream}' disabled: false - - euphrates: + - fraser: branch: 'stable/{stream}' disabled: false @@ -31,7 +31,6 @@ - 'parser' - 'smoke' - 'vnf' - - 'restapi' # settings for jobs run in multijob phases build-job-settings: &build-job-settings @@ -136,10 +135,6 @@ <<: *build-job-settings - name: 'functest-vnf-docker-build-arm64-{stream}' <<: *build-job-settings - - name: 'functest-restapi-docker-build-amd64-{stream}' - <<: *build-job-settings - - name: 'functest-restapi-docker-build-arm64-{stream}' - <<: *build-job-settings - multijob: name: 'publish all manifests' condition: SUCCESSFUL @@ -157,8 +152,6 @@ <<: *manifest-job-settings - name: 'functest-vnf-docker-manifest-{stream}' <<: *manifest-job-settings - - name: 'functest-restapi-docker-manifest-{stream}' - <<: *manifest-job-settings publishers: - 'functest-amd64-recipients' diff --git a/jjb/functest/functest-env-presetup.sh b/jjb/functest/functest-env-presetup.sh index 4738121de..323b325b4 100755 --- a/jjb/functest/functest-env-presetup.sh +++ b/jjb/functest/functest-env-presetup.sh @@ -49,7 +49,7 @@ elif [[ ${INSTALLER_TYPE} == 'daisy' ]]; then elif [[ ${INSTALLER_TYPE} == 'fuel' ]]; then if [[ ! "${BRANCH}" =~ "danube" ]]; then echo "Map mcp ssh_key" - export sshkey_vol="-v ${SSH_KEY}:/root/.ssh/id_rsa" + export sshkey_vol="-v ${SSH_KEY:-/var/lib/opnfv/mcp.rsa}:/root/.ssh/id_rsa" fi fi diff --git a/jjb/functest/functest-kubernetes-project-jobs.yml b/jjb/functest/functest-kubernetes-project-jobs.yml index 3eba5d177..55999060a 100644 --- a/jjb/functest/functest-kubernetes-project-jobs.yml +++ b/jjb/functest/functest-kubernetes-project-jobs.yml @@ -18,6 +18,10 @@ branch: '{stream}' gs-pathname: '' disabled: false + - fraser: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false - euphrates: branch: 'stable/{stream}' gs-pathname: '/{stream}' diff --git a/jjb/functest/functest-project-jobs.yml b/jjb/functest/functest-project-jobs.yml index e068a4fee..b3ab3ca37 100644 --- a/jjb/functest/functest-project-jobs.yml +++ b/jjb/functest/functest-project-jobs.yml @@ -18,6 +18,10 @@ branch: '{stream}' gs-pathname: '' disabled: false + - fraser: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false - euphrates: branch: 'stable/{stream}' gs-pathname: '/{stream}' diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml index 6171a6abd..628c13f79 100644 --- a/jjb/global/slave-params.yml +++ b/jjb/global/slave-params.yml @@ -19,6 +19,21 @@ default: /root/.ssh/id_rsa description: 'SSH key to use for Apex' +- parameter: + name: 'apex-baremetal-fraser-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'apex-baremetal-master' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' + - string: + name: SSH_KEY + default: /root/.ssh/id_rsa + description: 'SSH key to use for Apex' + - parameter: name: 'apex-baremetal-euphrates-defaults' parameters: @@ -65,6 +80,21 @@ default: /root/.ssh/id_rsa description: 'SSH key to use for Apex' +- parameter: + name: 'apex-virtual-fraser-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'apex-virtual-master' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' + - string: + name: SSH_KEY + default: /root/.ssh/id_rsa + description: 'SSH key to use for Apex' + - parameter: name: 'apex-virtual-euphrates-defaults' parameters: diff --git a/jjb/joid/joid-daily-jobs.yml b/jjb/joid/joid-daily-jobs.yml index 947b2f1ab..1e92fbfef 100644 --- a/jjb/joid/joid-daily-jobs.yml +++ b/jjb/joid/joid-daily-jobs.yml @@ -13,8 +13,8 @@ # ------------------------------- # BRANCH ANCHORS # ------------------------------- - euphrates: &euphrates - stream: euphrates + fraser: &fraser + stream: fraser branch: 'stable/{stream}' disabled: false gs-pathname: '/{stream}' @@ -31,7 +31,7 @@ pod: - baremetal: slave-label: joid-baremetal - <<: *euphrates + <<: *fraser - baremetal: slave-label: joid-baremetal <<: *master @@ -232,9 +232,9 @@ ######################## # trigger macros ######################## -# os-nosdn-nofeature-ha trigger - branch: euphrates +# os-nosdn-nofeature-ha trigger - branch: fraser - trigger: - name: 'joid-os-nosdn-nofeature-ha-baremetal-euphrates-trigger' + name: 'joid-os-nosdn-nofeature-ha-baremetal-fraser-trigger' triggers: - timed: '5 2 * * *' # os-nosdn-nofeature-ha trigger - branch: master @@ -242,9 +242,9 @@ name: 'joid-os-nosdn-nofeature-ha-baremetal-master-trigger' triggers: - timed: '5 2 * * *' -# os-odl_l2-nofeature-ha trigger - branch: euphrates +# os-odl_l2-nofeature-ha trigger - branch: fraser - trigger: - name: 'joid-os-odl_l2-nofeature-ha-baremetal-euphrates-trigger' + name: 'joid-os-odl_l2-nofeature-ha-baremetal-fraser-trigger' triggers: - timed: '5 7 * * *' # os-odl_l2-nofeature-ha trigger - branch: master @@ -252,9 +252,9 @@ name: 'joid-os-odl_l2-nofeature-ha-baremetal-master-trigger' triggers: - timed: '5 7 * * *' -# os-nosdn-lxd-noha trigger - branch: euphrates +# os-nosdn-lxd-noha trigger - branch: fraser - trigger: - name: 'joid-os-nosdn-lxd-noha-baremetal-euphrates-trigger' + name: 'joid-os-nosdn-lxd-noha-baremetal-fraser-trigger' triggers: - timed: '5 22 * * *' # os-nosdn-lxd-noha trigger - branch: master @@ -262,9 +262,9 @@ name: 'joid-os-nosdn-lxd-noha-baremetal-master-trigger' triggers: - timed: '5 22 * * *' -# os-nosdn-lxd-ha trigger - branch: euphrates +# os-nosdn-lxd-ha trigger - branch: fraser - trigger: - name: 'joid-os-nosdn-lxd-ha-baremetal-euphrates-trigger' + name: 'joid-os-nosdn-lxd-ha-baremetal-fraser-trigger' triggers: - timed: '5 10 * * *' # os-nosdn-lxd-ha trigger - branch: master @@ -272,9 +272,9 @@ name: 'joid-os-nosdn-lxd-ha-baremetal-master-trigger' triggers: - timed: '5 10 * * *' -# os-nosdn-nofeature-noha trigger - branch: euphrates +# os-nosdn-nofeature-noha trigger - branch: fraser - trigger: - name: 'joid-os-nosdn-nofeature-noha-baremetal-euphrates-trigger' + name: 'joid-os-nosdn-nofeature-noha-baremetal-fraser-trigger' triggers: - timed: '5 4 * * *' # os-nosdn-nofeature-noha trigger - branch: master @@ -282,9 +282,9 @@ name: 'joid-os-nosdn-nofeature-noha-baremetal-master-trigger' triggers: - timed: '5 4 * * *' -# k8-nosdn-nofeature-noha trigger - branch: euphrates +# k8-nosdn-nofeature-noha trigger - branch: fraser - trigger: - name: 'joid-k8-nosdn-nofeature-noha-baremetal-euphrates-trigger' + name: 'joid-k8-nosdn-nofeature-noha-baremetal-fraser-trigger' triggers: - timed: '5 15 * * *' # k8-nosdn-nofeature-noha trigger - branch: master @@ -292,9 +292,9 @@ name: 'joid-k8-nosdn-nofeature-noha-baremetal-master-trigger' triggers: - timed: '5 15 * * *' -# k8-nosdn-lb-noha trigger - branch: euphrates +# k8-nosdn-lb-noha trigger - branch: fraser - trigger: - name: 'joid-k8-nosdn-lb-noha-baremetal-euphrates-trigger' + name: 'joid-k8-nosdn-lb-noha-baremetal-fraser-trigger' triggers: - timed: '5 20 * * *' # k8-nosdn-lb-noha trigger - branch: master @@ -302,9 +302,9 @@ name: 'joid-k8-nosdn-lb-noha-baremetal-master-trigger' triggers: - timed: '5 20 * * *' -# k8-ovn-lb-noha trigger - branch: euphrates +# k8-ovn-lb-noha trigger - branch: fraser - trigger: - name: 'joid-k8-ovn-lb-noha-baremetal-euphrates-trigger' + name: 'joid-k8-ovn-lb-noha-baremetal-fraser-trigger' triggers: - timed: '5 17 * * *' # k8-ovn-lb-noha trigger - branch: master @@ -312,9 +312,9 @@ name: 'joid-k8-ovn-lb-noha-baremetal-master-trigger' triggers: - timed: '5 17 * * *' -# os-nosdn-openbaton-ha trigger - branch: euphrates +# os-nosdn-openbaton-ha trigger - branch: fraser - trigger: - name: 'joid-os-nosdn-openbaton-ha-baremetal-euphrates-trigger' + name: 'joid-os-nosdn-openbaton-ha-baremetal-fraser-trigger' triggers: - timed: '5 23 * * *' # os-nosdn-openbaton-ha trigger - branch: master @@ -322,9 +322,9 @@ name: 'joid-os-nosdn-openbaton-ha-baremetal-master-trigger' triggers: - timed: '5 23 * * *' -# os-ocl-nofeature-ha trigger - branch: euphrates +# os-ocl-nofeature-ha trigger - branch: fraser - trigger: - name: 'joid-os-ocl-nofeature-ha-baremetal-euphrates-trigger' + name: 'joid-os-ocl-nofeature-ha-baremetal-fraser-trigger' triggers: - timed: '5 13 * * *' # os-ocl-nofeature-ha trigger - branch: master @@ -332,9 +332,9 @@ name: 'joid-os-ocl-nofeature-ha-baremetal-master-trigger' triggers: - timed: '5 13 * * *' -# os-ocl-nofeature-noha trigger - branch: euphrates +# os-ocl-nofeature-noha trigger - branch: fraser - trigger: - name: 'joid-os-ocl-nofeature-noha-baremetal-euphrates-trigger' + name: 'joid-os-ocl-nofeature-noha-baremetal-fraser-trigger' triggers: - timed: '5 16 * * *' # os-ocl-nofeature-noha trigger - branch: master @@ -342,9 +342,9 @@ name: 'joid-os-ocl-nofeature-noha-baremetal-master-trigger' triggers: - timed: '5 16 * * *' -# k8-canal-lb-noha trigger - branch: euphrates +# k8-canal-lb-noha trigger - branch: fraser - trigger: - name: 'joid-k8-canal-lb-noha-baremetal-euphrates-trigger' + name: 'joid-k8-canal-lb-noha-baremetal-fraser-trigger' triggers: - timed: '5 14 * * *' # k8-canal-lb-noha trigger - branch: master @@ -352,9 +352,9 @@ name: 'joid-k8-canal-lb-noha-baremetal-master-trigger' triggers: - timed: '5 14 * * *' -# k8-multus-lb-noha trigger - branch: euphrates +# k8-multus-lb-noha trigger - branch: fraser - trigger: - name: 'joid-k8-multus-lb-noha-baremetal-euphrates-trigger' + name: 'joid-k8-multus-lb-noha-baremetal-fraser-trigger' triggers: - timed: '5 18 * * *' # k8-multus-lb-noha trigger - branch: master @@ -362,9 +362,9 @@ name: 'joid-k8-multus-lb-noha-baremetal-master-trigger' triggers: - timed: '5 18 * * *' -# k8-nosdn-lb_ceph-noha trigger - branch: euphrates +# k8-nosdn-lb_ceph-noha trigger - branch: fraser - trigger: - name: 'joid-k8-nosdn-lb_ceph-noha-baremetal-euphrates-trigger' + name: 'joid-k8-nosdn-lb_ceph-noha-baremetal-fraser-trigger' triggers: - timed: '5 18 * * *' # k8-nosdn-lb_ceph-noha trigger - branch: master @@ -372,9 +372,9 @@ name: 'joid-k8-nosdn-lb_ceph-noha-baremetal-master-trigger' triggers: - timed: '5 18 * * *' -# os-ovn-nofeature-ha trigger - branch: euphrates +# os-ovn-nofeature-ha trigger - branch: fraser - trigger: - name: 'joid-os-ovn-nofeature-ha-baremetal-euphrates-trigger' + name: 'joid-os-ovn-nofeature-ha-baremetal-fraser-trigger' triggers: - timed: '5 19 * * *' # os-ovn-nofeature-ha trigger - branch: master diff --git a/jjb/joid/joid-verify-jobs.yml b/jjb/joid/joid-verify-jobs.yml index 53bc3f38a..2d1c7c9f3 100644 --- a/jjb/joid/joid-verify-jobs.yml +++ b/jjb/joid/joid-verify-jobs.yml @@ -13,7 +13,7 @@ branch: '{stream}' gs-pathname: '' disabled: false - - euphrates: + - fraser: &fraser branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false diff --git a/jjb/pharos/check-jinja2.yml b/jjb/pharos/check-jinja2.yml index 3ef2f04e5..e3f0df78a 100644 --- a/jjb/pharos/check-jinja2.yml +++ b/jjb/pharos/check-jinja2.yml @@ -15,6 +15,9 @@ - master: branch: '{stream}' disabled: false + - fraser: &fraser + branch: 'stable/{stream}' + disabled: false - euphrates: branch: 'stable/{stream}' disabled: false diff --git a/jjb/qtip/qtip-validate-jobs.yml b/jjb/qtip/qtip-validate-jobs.yml index c5bf58391..f20b321ad 100644 --- a/jjb/qtip/qtip-validate-jobs.yml +++ b/jjb/qtip/qtip-validate-jobs.yml @@ -14,8 +14,8 @@ branch: '{stream}' gs-pathname: '' docker-tag: latest - euphrates: &euphrates - stream: euphrates + fraser: &fraser + stream: fraser branch: 'stable/{stream}' gs-pathname: '{stream}' docker-tag: 'stable' @@ -94,7 +94,7 @@ wrappers: - timeout: - timeout: 30 + timeout: 120 abort: true - timestamps diff --git a/jjb/qtip/qtip-verify-jobs.yml b/jjb/qtip/qtip-verify-jobs.yml index 8698fa055..12cfa95b7 100644 --- a/jjb/qtip/qtip-verify-jobs.yml +++ b/jjb/qtip/qtip-verify-jobs.yml @@ -13,7 +13,7 @@ branch: '{stream}' gs-pathname: '' disabled: false - - euphrates: + - fraser: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false diff --git a/jjb/releng/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml index 55cbc5f1d..5406bc86d 100644 --- a/jjb/releng/opnfv-docker.yml +++ b/jjb/releng/opnfv-docker.yml @@ -19,6 +19,10 @@ stream: euphrates branch: 'stable/{stream}' disabled: false + fraser: &fraser + stream: fraser + branch: 'stable/{stream}' + disabled: false storperf-receivers: &storperf-receivers receivers: > mark.beierl@emc.com @@ -134,6 +138,11 @@ project: 'functest-kubernetes' <<: *master <<: *other-receivers + # projects with jobs for fraser + - 'functest-kubernetes': + project: 'functest-kubernetes' + <<: *fraser + <<: *other-receivers # projects with jobs for euphrates - 'bottlenecks': project: 'bottlenecks' diff --git a/jjb/releng/opnfv-lint.yml b/jjb/releng/opnfv-lint.yml index 0ac552082..80893de89 100644 --- a/jjb/releng/opnfv-lint.yml +++ b/jjb/releng/opnfv-lint.yml @@ -11,12 +11,17 @@ jobs: - 'opnfv-lint-verify-{stream}' - 'opnfv-yamllint-verify-{stream}' + - 'opnfv-pylint-verify-{stream}' stream: - master: branch: '{stream}' gs-pathname: '' disabled: false + - fraser: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false - danube: branch: 'stable/{stream}' gs-pathname: '/{stream}' diff --git a/jjb/releng/releng-release-create-branch.sh b/jjb/releng/releng-release-create-branch.sh index 83755608e..92be0e637 100644 --- a/jjb/releng/releng-release-create-branch.sh +++ b/jjb/releng/releng-release-create-branch.sh @@ -31,7 +31,7 @@ for release_file in $RELEASE_FILES; do NEW_FILES=$(git status --porcelain --untracked=no | cut -c4-) if [ -n "$NEW_FILES" ]; then git add $NEW_FILES - git commit -m "Create Stable Branch Jobs for $(basename $release_file .yaml)" + git commit -sm "Create Stable Branch Jobs for $(basename $release_file .yaml)" git push origin HEAD:refs/for/master fi done diff --git a/jjb/storperf/storperf-daily-jobs.yml b/jjb/storperf/storperf-daily-jobs.yml index 3c9e527be..fe6aebb11 100644 --- a/jjb/storperf/storperf-daily-jobs.yml +++ b/jjb/storperf/storperf-daily-jobs.yml @@ -15,8 +15,8 @@ branch: '{stream}' gs-pathname: '' docker-tag: 'latest' - euphrates: &euphrates - stream: euphrates + fraser: &fraser + stream: fraser branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false @@ -69,7 +69,7 @@ - baremetal: slave-label: apex-baremetal-master installer: apex - <<: *euphrates + <<: *fraser ## armband CI PODs # - armband-baremetal: # slave-label: armband-baremetal diff --git a/jjb/storperf/storperf-verify-jobs.yml b/jjb/storperf/storperf-verify-jobs.yml index 7e29addb9..4d6b1740a 100644 --- a/jjb/storperf/storperf-verify-jobs.yml +++ b/jjb/storperf/storperf-verify-jobs.yml @@ -13,7 +13,7 @@ gs-pathname: '' disabled: false docker-tag: 'latest' - - euphrates: + - fraser: &fraser branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false diff --git a/jjb/storperf/storperf.yml b/jjb/storperf/storperf.yml index b9f3a3679..fe5784777 100644 --- a/jjb/storperf/storperf.yml +++ b/jjb/storperf/storperf.yml @@ -13,7 +13,7 @@ gs-pathname: '' disabled: false docker-tag: 'latest' - - euphrates: + - fraser: &fraser branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false @@ -32,7 +32,8 @@ name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT # yamllint disable rule:line-length - description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW." + description: "Used for overriding the GIT URL coming from Global Jenkins\ + \ configuration in case if the stuff is done on none-LF HW." # yamllint enable rule:line-length scm: diff --git a/jjb/vswitchperf/vswitchperf.yml b/jjb/vswitchperf/vswitchperf.yml index 7fd875bcb..01a154aec 100644 --- a/jjb/vswitchperf/vswitchperf.yml +++ b/jjb/vswitchperf/vswitchperf.yml @@ -15,6 +15,10 @@ branch: '{stream}' gs-pathname: '' disabled: false + - fraser: &fraser + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false - euphrates: branch: 'stable/{stream}' gs-pathname: '/{stream}' diff --git a/releases/fraser/apex.yaml b/releases/fraser/apex.yaml new file mode 100644 index 000000000..70f34fa88 --- /dev/null +++ b/releases/fraser/apex.yaml @@ -0,0 +1,29 @@ +# SPDX-License-Identifier: Apache-2.0 +############################################################################## +# Copyright (c) 2018 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: apex +project-type: installer +release-model: stable +upstream: https://wiki.openstack.org/wiki/TripleO + +branches: + - name: stable/fraser + location: + apex: b047099b609eac330486f23913e8046d0f22c1ab + - name: stable/fraser + location: + apex-tripleo-heat-templates: 01db62fd83df2af8b7d87280919a435ee43dc40f + - name: stable/fraser + location: + apex-puppet-tripleo: 7e42851739337960ff1255f9c84773aa13d47bc0 + - name: stable/fraser + location: + apex-os-net-config: a301f9f0fff8b227562fdec639e66d76dafb4634 + +release-notes: http://docs.opnfv.org/en/stable-euphrates/submodules/apex/docs/release/release-notes/release-notes.html diff --git a/releases/fraser/armband.yml b/releases/fraser/armband.yml new file mode 100644 index 000000000..ae2e44db4 --- /dev/null +++ b/releases/fraser/armband.yml @@ -0,0 +1,9 @@ +--- +project: armband +project-type: installer +release-model: stable + +branches: + - name: stable/fraser + location: + armband: 46040c0ab85aeba942b7ec7897b32243f859aac0 diff --git a/releases/fraser/barometer.yaml b/releases/fraser/barometer.yaml new file mode 100644 index 000000000..1ff908544 --- /dev/null +++ b/releases/fraser/barometer.yaml @@ -0,0 +1,9 @@ +--- +project: barometer +project-type: feature +release-model: stable + +branches: + - name: stable/fraser + location: + barometer: 2d98d11d981dc9e6597532f130a241cd20cc963d diff --git a/releases/fraser/bottlenecks.yaml b/releases/fraser/bottlenecks.yaml new file mode 100644 index 000000000..778e6ed3b --- /dev/null +++ b/releases/fraser/bottlenecks.yaml @@ -0,0 +1,9 @@ +--- +project: bottlenecks +project-type: testing +release-model: stable + +branches: + - name: stable/fraser + location: + bottlenecks: d10c4644d44f707998c7f05dc72ec4913576b752 diff --git a/releases/fraser/clover.yaml b/releases/fraser/clover.yaml new file mode 100644 index 000000000..91758cd9a --- /dev/null +++ b/releases/fraser/clover.yaml @@ -0,0 +1,9 @@ +--- +project: clover +project-type: feature +release-model: stable + +branches: + - name: stable/fraser + location: + clover: 67b7fb49e6ea6ac9c2547af263355e5f1aeade42 diff --git a/releases/fraser/container4nfv.yaml b/releases/fraser/container4nfv.yaml new file mode 100644 index 000000000..f117f33fd --- /dev/null +++ b/releases/fraser/container4nfv.yaml @@ -0,0 +1,9 @@ +--- +project: container4nfv +project-type: feature +release-model: stable + +branches: + - name: stable/fraser + location: + container4nfv: I6145b406450b0846999223f1e4e6783eb06bb0a9 diff --git a/releases/fraser/daisy.yaml b/releases/fraser/daisy.yaml new file mode 100644 index 000000000..78efc4810 --- /dev/null +++ b/releases/fraser/daisy.yaml @@ -0,0 +1,9 @@ +--- +project: daisy +project-type: installer +release-model: stable + +branches: + - name: stable/fraser + location: + daisy: 5bbbe44397d946b4d6fb3bdee6fba2c09131b698 diff --git a/releases/fraser/doctor.yaml b/releases/fraser/doctor.yaml new file mode 100644 index 000000000..bc74a0346 --- /dev/null +++ b/releases/fraser/doctor.yaml @@ -0,0 +1,9 @@ +--- +project: doctor +project-type: feature +release-model: stable + +branches: + - name: stable/fraser + location: + doctor: 06980156b3eed6a6e456d3105c70b68386c1dfb7 diff --git a/releases/fraser/fds.yaml b/releases/fraser/fds.yaml new file mode 100644 index 000000000..9d08cbf46 --- /dev/null +++ b/releases/fraser/fds.yaml @@ -0,0 +1,9 @@ +--- +project: fds +project-type: feature +release-model: stable + +branches: + - name: stable/fraser + location: + fds: 6eb4ed8ce9be7135ec65318b7b833f3c487498be diff --git a/releases/fraser/fuel.yaml b/releases/fraser/fuel.yaml new file mode 100644 index 000000000..d0b7b1912 --- /dev/null +++ b/releases/fraser/fuel.yaml @@ -0,0 +1,9 @@ +--- +project: fuel +project-type: installer +release-model: stable + +branches: + - name: stable/fraser + location: + fuel: e083cf6350a227da161b07d2c68d9aa200611b32 diff --git a/releases/fraser/joid.yaml b/releases/fraser/joid.yaml new file mode 100644 index 000000000..c2ca0cde1 --- /dev/null +++ b/releases/fraser/joid.yaml @@ -0,0 +1,9 @@ +--- +project: joid +project-type: installer +release-model: stable + +branches: + - name: stable/fraser + location: + joid: f1b6b2867e4e907cb84ea4670ad32f36bddcbf6c diff --git a/releases/fraser/nfvbench.yaml b/releases/fraser/nfvbench.yaml new file mode 100644 index 000000000..e573a8b69 --- /dev/null +++ b/releases/fraser/nfvbench.yaml @@ -0,0 +1,9 @@ +--- +project: nfvbench +project-type: tools +release-model: stable + +branches: + - name: stable/fraser + location: + nfvbench: 34c00544f7f7dbfa49bbdcd83eca2936b60826c7 diff --git a/releases/fraser/ovn4nfv.yaml b/releases/fraser/ovn4nfv.yaml new file mode 100644 index 000000000..a04bd0266 --- /dev/null +++ b/releases/fraser/ovn4nfv.yaml @@ -0,0 +1,9 @@ +--- +project: ovn4nfv +project-type: feature +release-model: stable + +branches: + - name: stable/fraser + location: + ovn4nfv: 9623c07f59e059ed0b1cdc6fdfec9c7d9996d88d diff --git a/releases/fraser/ovno.yaml b/releases/fraser/ovno.yaml new file mode 100644 index 000000000..f014982e7 --- /dev/null +++ b/releases/fraser/ovno.yaml @@ -0,0 +1,9 @@ +--- +project: ovno +project-type: feature +release-model: stable + +branches: + - name: stable/fraser + location: + ovno: 8d1f11e6e6b114bd1a21295e6b47ddf59305ee35 diff --git a/releases/fraser/parser.yaml b/releases/fraser/parser.yaml new file mode 100644 index 000000000..a5929456e --- /dev/null +++ b/releases/fraser/parser.yaml @@ -0,0 +1,9 @@ +--- +project: parser +project-type: feature +release-model: stable + +branches: + - name: stable/fraser + location: + parser: cabfeecb3259c5e22488756d91b6f72d27c4c18a diff --git a/releases/fraser/pharos.yaml b/releases/fraser/pharos.yaml new file mode 100644 index 000000000..0da6096d5 --- /dev/null +++ b/releases/fraser/pharos.yaml @@ -0,0 +1,12 @@ +--- +project: pharos +project-type: infra +release-model: stable + +branches: + - name: stable/fraser + location: + pharos: 02a3385322bad418f2b16854983546a59c3cf919 + - name: stable/fraser + location: + pharos-tools: b011d39bb162bf77f4bca8c6708b82973eb56eb6 diff --git a/releases/fraser/qtip.yaml b/releases/fraser/qtip.yaml new file mode 100644 index 000000000..575a53ec1 --- /dev/null +++ b/releases/fraser/qtip.yaml @@ -0,0 +1,9 @@ +--- +project: qtip +project-type: testing +release-model: stable + +branches: + - name: stable/fraser + location: + qtip: 357bffcd84ad61d1421eb8b63cdc549d69d365a7 diff --git a/releases/fraser/samplevnf.yaml b/releases/fraser/samplevnf.yaml new file mode 100644 index 000000000..c6eda5a0c --- /dev/null +++ b/releases/fraser/samplevnf.yaml @@ -0,0 +1,9 @@ +--- +project: samplevnf +project-type: feature +release-model: stable + +branches: + - name: stable/fraser + location: + samplevnf: b38082760fc411a8fc9e74f9c2d3a44ad633db5c diff --git a/releases/fraser/snaps.yaml b/releases/fraser/snaps.yaml new file mode 100644 index 000000000..17318ccae --- /dev/null +++ b/releases/fraser/snaps.yaml @@ -0,0 +1,9 @@ +--- +project: snaps +project-type: tools +release-model: stable + +branches: + - name: stable/fraser + location: + snaps: 65aca3d6919a3d31fa360afa01baee5ebff1fe22 diff --git a/releases/fraser/stor4nfv.yaml b/releases/fraser/stor4nfv.yaml new file mode 100644 index 000000000..4700233aa --- /dev/null +++ b/releases/fraser/stor4nfv.yaml @@ -0,0 +1,9 @@ +--- +project: stor4nfv +project-type: feature +release-model: stable + +branches: + - name: stable/fraser + location: + stor4nfv: I05dd6f833716e36d173f0b4e7f6a317d41f1a039 diff --git a/releases/fraser/storperf.yaml b/releases/fraser/storperf.yaml new file mode 100644 index 000000000..4a1734c76 --- /dev/null +++ b/releases/fraser/storperf.yaml @@ -0,0 +1,9 @@ +--- +project: storperf +project-type: testing +release-model: stable + +branches: + - name: stable/euphrates + location: + storperf: ce8adafbccb4bc37930f95561fa24874906013ad diff --git a/releases/fraser/vswitchperf.yaml b/releases/fraser/vswitchperf.yaml new file mode 100644 index 000000000..bcf60e757 --- /dev/null +++ b/releases/fraser/vswitchperf.yaml @@ -0,0 +1,9 @@ +--- +project: vswitchperf +project-type: testing +release-model: stable + +branches: + - name: stable/fraser + location: + vswitchperf: a87a7696e58082b10fadef24176d53ebc67f3bd5 diff --git a/releases/fraser/yardstick.yaml b/releases/fraser/yardstick.yaml new file mode 100644 index 000000000..53bcfa625 --- /dev/null +++ b/releases/fraser/yardstick.yaml @@ -0,0 +1,9 @@ +--- +project: yardstick +project-type: testing +release-model: stable + +branches: + - name: stable/fraser + location: + yardstick: f19016b39b828f648a66adc305cce17f5146e922