diff options
Diffstat (limited to 'jjb')
52 files changed, 1028 insertions, 336 deletions
diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh index 123db3e85..94d464259 100755 --- a/jjb/apex/apex-deploy.sh +++ b/jjb/apex/apex-deploy.sh @@ -121,7 +121,7 @@ if [[ "$JOB_NAME" =~ "virtual" ]]; then DEPLOY_CMD="${DEPLOY_CMD} -e csit-environment.yaml" fi if [[ "$PROMOTE" == "True" ]]; then - DEPLOY_CMD="${DEPLOY_CMD} --virtual-computes 2" + DEPLOY_CMD="${DEPLOY_CMD} --virtual-computes 1" fi else # settings for bare metal deployment diff --git a/jjb/apex/apex-download-artifact.sh b/jjb/apex/apex-download-artifact.sh index c12406cdb..066d61203 100755 --- a/jjb/apex/apex-download-artifact.sh +++ b/jjb/apex/apex-download-artifact.sh @@ -10,6 +10,26 @@ echo [[ -d $BUILD_DIRECTORY ]] || mkdir -p $BUILD_DIRECTORY +if [ -z "$DEPLOY_SCENARIO" ]; then + echo "Deploy scenario not set!" + exit 1 +elif [[ "$DEPLOY_SCENARIO" == *gate* ]]; then + echo "Detecting Gating scenario..." + if [ -z "$GERRIT_EVENT_COMMENT_TEXT" ]; then + echo "ERROR: Gate job triggered without comment!" + exit 1 + else + DEPLOY_SCENARIO=$(echo ${GERRIT_EVENT_COMMENT_TEXT} | grep start-gate-scenario | grep -Eo 'os-.*$') + if [ -z "$DEPLOY_SCENARIO" ]; then + echo "ERROR: Unable to detect scenario in Gerrit Comment!" + echo "Format of comment to trigger gate should be 'start-gate-scenario: <scenario>'" + exit 1 + else + echo "Gate scenario detected: ${DEPLOY_SCENARIO}" + fi + fi +fi + # if upstream we do not need to download anything if [[ "$DEPLOY_SCENARIO" =~ upstream ]]; then echo "Upstream deployment detected, skipping download artifact" diff --git a/jjb/apex/apex-fetch-logs.sh b/jjb/apex/apex-fetch-logs.sh new file mode 100755 index 000000000..bdb2252b3 --- /dev/null +++ b/jjb/apex/apex-fetch-logs.sh @@ -0,0 +1,25 @@ +#!/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 + sudo chmod 777 ${LOG_LOCATION} + UPLOAD_LOCATION="${GS_URL}/logs/${JOB_NAME}/${BUILD_NUMBER}/" + gsutil -m cp -r ${LOG_LOCATION} gs://${UPLOAD_LOCATION} > gsutil.latest_logs.log + echo -e "Logs available at: \n$(find ${LOG_LOCATION} -type f | sed -n 's#^/tmp/#http://'$UPLOAD_LOCATION'#p')" + 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..79b358815 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 @@ -337,7 +342,7 @@ properties-file: detected_scenario - multijob: name: functest-smoke - condition: SUCCESSFUL + condition: ALWAYS projects: - name: 'functest-apex-virtual-suite-{stream}' current-parameters: false @@ -353,6 +358,19 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false + - multijob: + name: apex-fetch-logs + 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 e19a90e94..80ba50b71 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -3,6 +3,7 @@ name: 'apex' project: 'apex' jobs: + - 'apex-fetch-logs-{stream}' - 'apex-runner-cperf-{stream}' - 'apex-virtual-{stream}' - 'apex-deploy-{platform}-{stream}' @@ -27,6 +28,17 @@ verify-scenario: 'os-odl-nofeature-ha' 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' @@ -36,6 +48,7 @@ verify-scenario: 'os-odl-nofeature-ha' scenario_stream: 'euphrates' disable_daily: true + disable_promote: true - danube: &danube branch: 'stable/danube' gs-pathname: '/danube' @@ -46,9 +59,46 @@ scenario_stream: 'danube' disabled: true disable_daily: true + 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': <<: *danube @@ -181,6 +231,38 @@ - 'baremetal' - 'virtual' + os_version: + - 'pike' + - 'queens' + - 'master' + + +# Fetch Logs Job +- job-template: + name: 'apex-fetch-logs-{stream}' + + concurrent: true + + disabled: false + scm: + - git-scm-gerrit + parameters: + - 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}' @@ -374,7 +456,7 @@ git-revision: true - multijob: name: functest-smoke - condition: SUCCESSFUL + condition: ALWAYS projects: - name: 'functest-apex-virtual-suite-{stream}' current-parameters: false @@ -389,6 +471,20 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false + - multijob: + name: apex-fetch-logs + 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: @@ -450,6 +546,7 @@ git-revision: false - multijob: name: 'OPNFV Test Suite' + condition: ALWAYS projects: - name: 'apex-testsuite-{scenario}-baremetal-{scenario_stream}' node-parameters: true @@ -459,7 +556,18 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - + - multijob: + name: apex-fetch-logs + 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: @@ -691,7 +799,7 @@ # branch: branch (eg. stable) node: '{virtual-slave}' project-type: 'multijob' - disabled: false + disabled: '{disable_promote}' scm: - git-scm @@ -718,28 +826,13 @@ builders: - multijob: - name: build - condition: SUCCESSFUL - projects: - - name: 'apex-build-{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: false - kill-phase-on: FAILURE - abort-all-job: true - git-revision: true - - multijob: name: deploy-virtual condition: SUCCESSFUL projects: - name: 'apex-deploy-virtual-{stream}' current-parameters: false predefined-parameters: | - DEPLOY_SCENARIO=os-odl_l3-csit-noha + DEPLOY_SCENARIO=os-odl-{os_version}_upstream-noha OPNFV_CLEAN=yes GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC @@ -757,7 +850,7 @@ - name: 'functest-apex-virtual-suite-{stream}' current-parameters: false predefined-parameters: | - DEPLOY_SCENARIO=os-odl_l3-nofeature-noha + DEPLOY_SCENARIO=os-odl-{os_version}_upstream-noha FUNCTEST_SUITE_NAME=tempest_smoke_serial GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC @@ -1079,6 +1172,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 @@ -1635,6 +1881,12 @@ - shell: !include-raw: ./apex-deploy.sh +- builder: + name: 'apex-fetch-logs' + builders: + - shell: + !include-raw: ./apex-fetch-logs.sh + ####################### # trigger macros ######################## @@ -1644,6 +1896,11 @@ - timed: '0 0 1-31/2 * *' - trigger: + name: 'apex-fraser' + triggers: + - timed: '0 0 2-30/2 * *' + +- trigger: name: 'apex-euphrates' triggers: - timed: '0 0 2-30/2 * *' diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2 index ecc6f270c..29a93b4d0 100644 --- a/jjb/apex/apex.yml.j2 +++ b/jjb/apex/apex.yml.j2 @@ -3,6 +3,7 @@ name: 'apex' project: 'apex' jobs: + - 'apex-fetch-logs-{stream}' - 'apex-runner-cperf-{stream}' - 'apex-virtual-{stream}' - 'apex-deploy-{platform}-{stream}' @@ -27,6 +28,17 @@ verify-scenario: 'os-odl-nofeature-ha' 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' @@ -36,6 +48,7 @@ verify-scenario: 'os-odl-nofeature-ha' scenario_stream: 'euphrates' disable_daily: true + disable_promote: true - danube: &danube branch: 'stable/danube' gs-pathname: '/danube' @@ -46,6 +59,7 @@ scenario_stream: 'danube' disabled: true disable_daily: true + disable_promote: true scenario: {%- for stream in scenarios %} @@ -59,6 +73,38 @@ - 'baremetal' - 'virtual' + os_version: + - 'pike' + - 'queens' + - 'master' + + +# Fetch Logs Job +- job-template: + name: 'apex-fetch-logs-{stream}' + + concurrent: true + + disabled: false + scm: + - git-scm-gerrit + parameters: + - 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}' @@ -252,7 +298,7 @@ git-revision: true - multijob: name: functest-smoke - condition: SUCCESSFUL + condition: ALWAYS projects: - name: 'functest-apex-virtual-suite-{stream}' current-parameters: false @@ -267,6 +313,20 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false + - multijob: + name: apex-fetch-logs + 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: @@ -328,6 +388,7 @@ git-revision: false - multijob: name: 'OPNFV Test Suite' + condition: ALWAYS projects: - name: 'apex-testsuite-{scenario}-baremetal-{scenario_stream}' node-parameters: true @@ -337,7 +398,18 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - + - multijob: + name: apex-fetch-logs + 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: @@ -569,7 +641,7 @@ # branch: branch (eg. stable) node: '{virtual-slave}' project-type: 'multijob' - disabled: false + disabled: '{disable_promote}' scm: - git-scm @@ -596,28 +668,13 @@ builders: - multijob: - name: build - condition: SUCCESSFUL - projects: - - name: 'apex-build-{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: false - kill-phase-on: FAILURE - abort-all-job: true - git-revision: true - - multijob: name: deploy-virtual condition: SUCCESSFUL projects: - name: 'apex-deploy-virtual-{stream}' current-parameters: false predefined-parameters: | - DEPLOY_SCENARIO=os-odl_l3-csit-noha + DEPLOY_SCENARIO=os-odl-{os_version}_upstream-noha OPNFV_CLEAN=yes GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC @@ -635,7 +692,7 @@ - name: 'functest-apex-virtual-suite-{stream}' current-parameters: false predefined-parameters: | - DEPLOY_SCENARIO=os-odl_l3-nofeature-noha + DEPLOY_SCENARIO=os-odl-{os_version}_upstream-noha FUNCTEST_SUITE_NAME=tempest_smoke_serial GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC @@ -995,6 +1052,12 @@ - shell: !include-raw: ./apex-deploy.sh +- builder: + name: 'apex-fetch-logs' + builders: + - shell: + !include-raw: ./apex-fetch-logs.sh + ####################### # trigger macros ######################## @@ -1004,6 +1067,11 @@ - timed: '0 0 1-31/2 * *' - trigger: + name: 'apex-fraser' + triggers: + - timed: '0 0 2-30/2 * *' + +- trigger: name: 'apex-euphrates' triggers: - timed: '0 0 2-30/2 * *' 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/clover/clover-project.yml b/jjb/clover/clover-project.yml index b31f3deb2..9744688a7 100644 --- a/jjb/clover/clover-project.yml +++ b/jjb/clover/clover-project.yml @@ -18,6 +18,10 @@ branch: '{stream}' gs-pathname: '' disabled: false + - fraser: &fraser + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false - job-template: name: 'clover-verify-{stream}' @@ -32,7 +36,8 @@ - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT - 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 - 'opnfv-build-ubuntu-defaults' @@ -133,7 +138,8 @@ - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT - 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 - node: name: SLAVE_NAME 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: @@ -486,10 +483,6 @@ 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: - timed: '0 15 * * *' @@ -583,10 +576,6 @@ 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: - timed: '' # '0 15 * * *' @@ -679,10 +668,6 @@ 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: - timed: '0 18 1-29/2 * *' @@ -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: '' @@ -871,10 +852,6 @@ 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: - timed: '0 19 2-30/2 * *' @@ -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/doctor/doctor.yml b/jjb/doctor/doctor.yml index 8c04ffd53..eba22dc05 100644 --- a/jjb/doctor/doctor.yml +++ b/jjb/doctor/doctor.yml @@ -10,7 +10,7 @@ gs-pathname: '' docker-tag: 'latest' disabled: false - - euphrates: + - fraser: &fraser branch: 'stable/{stream}' gs-pathname: '/{stream}' docker-tag: 'stable' 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-alpine.sh b/jjb/functest/functest-alpine.sh index dfadf9a37..72b94bd18 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -28,12 +28,12 @@ check_os_deployment() { run_tiers() { tiers=$1 - if [[ ${BRANCH##*/} == "master" ]]; then - cmd_opt="run_tests -r -t all" - [[ $BUILD_TAG =~ "suite" ]] && cmd_opt="run_tests -t all" - else + if [[ ${BRANCH##*/} == "stable/euphrates" ]]; then cmd_opt="prepare_env start && run_tests -r -t all" [[ $BUILD_TAG =~ "suite" ]] && cmd_opt="prepare_env start && run_tests -t all" + else + cmd_opt="run_tests -r -t all" + [[ $BUILD_TAG =~ "suite" ]] && cmd_opt="run_tests -t all" fi ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value" echo 0 > ${ret_val_file} @@ -58,10 +58,10 @@ run_tiers() { run_test() { test_name=$1 - if [[ ${BRANCH##*/} == "master" ]]; then - cmd_opt="run_tests -t ${test_name}" - else + if [[ ${BRANCH##*/} == "stable/euphrates" ]]; then cmd_opt="prepare_env start && run_tests -t ${test_name}" + else + cmd_opt="run_tests -t ${test_name}" fi ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value" echo 0 > ${ret_val_file} @@ -177,7 +177,6 @@ volumes="${images_vol} ${results_vol} ${sshkey_vol} ${userconfig_vol} ${rc_file_ set +e -[[ ${BRANCH##*/} == "master" ]] && check_os_deployment if [ ${FUNCTEST_MODE} == 'testcase' ]; then echo "FUNCTEST_MODE=testcase, FUNCTEST_SUITE_NAME=${FUNCTEST_SUITE_NAME}" run_test ${FUNCTEST_SUITE_NAME} diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml index 8ffbe9e63..b93a56bad 100644 --- a/jjb/functest/functest-daily-jobs.yml +++ b/jjb/functest/functest-daily-jobs.yml @@ -14,6 +14,10 @@ stream: master branch: '{stream}' gs-pathname: '' + fraser: &fraser + stream: fraser + branch: 'stable/{stream}' + gs-pathname: '/{stream}' euphrates: &euphrates stream: euphrates branch: 'stable/{stream}' 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 b7d33e760..323b325b4 100755 --- a/jjb/functest/functest-env-presetup.sh +++ b/jjb/functest/functest-env-presetup.sh @@ -45,5 +45,11 @@ elif [[ ${INSTALLER_TYPE} == 'daisy' ]]; then echo "No available installer VM exists...exiting" exit 1 fi + +elif [[ ${INSTALLER_TYPE} == 'fuel' ]]; then + if [[ ! "${BRANCH}" =~ "danube" ]]; then + echo "Map mcp ssh_key" + export sshkey_vol="-v ${SSH_KEY:-/var/lib/opnfv/mcp.rsa}:/root/.ssh/id_rsa" + fi fi diff --git a/jjb/functest/functest-kubernetes-docker.yml b/jjb/functest/functest-kubernetes-docker.yml new file mode 100644 index 000000000..de1895dce --- /dev/null +++ b/jjb/functest/functest-kubernetes-docker.yml @@ -0,0 +1,174 @@ +--- +############################################## +# job configuration for docker build and push +############################################## +- project: + + name: functest-kubernetes-docker + + project: functest-kubernetes + + stream: + - master: + branch: '{stream}' + disabled: false + - fraser: + branch: 'stable/{stream}' + disabled: false + + arch_tag: + - 'amd64': + slave_label: 'opnfv-build-ubuntu' + + # yamllint disable rule:key-duplicates + image: + - 'core' + + # settings for jobs run in multijob phases + build-job-settings: &build-job-settings + current-parameters: false + git-revision: true + node-parameters: false + predefined-parameters: | + PUSH_IMAGE=$PUSH_IMAGE + COMMIT_ID=$COMMIT_ID + GERRIT_REFNAME=$GERRIT_REFNAME + DOCKERFILE=$DOCKERFILE + kill-phase-on: FAILURE + abort-all-jobs: false + + manifest-job-settings: &manifest-job-settings + current-parameters: false + git-revision: true + node-parameters: false + predefined-parameters: + GERRIT_REFNAME=$GERRIT_REFNAME + kill-phase-on: FAILURE + abort-all-jobs: false + + # yamllint enable rule:key-duplicates + jobs: + - "functest-kubernetes-docker-{stream}" + - "functest-kubernetes-{image}-docker-build-{arch_tag}-{stream}" + +######################## +# job templates +######################## +- job-template: + name: 'functest-kubernetes-docker-{stream}' + + project-type: multijob + + disabled: '{obj:disabled}' + + parameters: + - functest-kubernetes-job-parameters: + project: '{project}' + branch: '{branch}' + slave_label: 'opnfv-build-ubuntu' + arch_tag: 'amd64' + + properties: + - throttle: + max-per-node: 1 + option: 'project' + + scm: + - git-scm + + triggers: + - pollscm: + cron: "*/30 * * * *" + - gerrit-trigger-tag-created: + project: '{project}' + + builders: + - multijob: + name: 'build functest-kubernetes-core images' + execution-type: PARALLEL + projects: + - name: 'functest-kubernetes-core-docker-build-amd64-{stream}' + <<: *build-job-settings + + publishers: + - 'functest-kubernetes-amd64-recipients' + +- job-template: + name: 'functest-kubernetes-{image}-docker-build-{arch_tag}-{stream}' + disabled: '{obj:disabled}' + parameters: + - functest-kubernetes-job-parameters: + project: '{project}' + branch: '{branch}' + slave_label: '{slave_label}' + arch_tag: '{arch_tag}' + scm: + - git-scm + builders: + - shell: | + #!/bin/bash -ex + case "{stream}" in + "master") + tag="latest" ;; + *) + tag="{stream}" ;; + esac + (cd docker && sudo docker build --pull=true --no-cache --force-rm=true \ + -t "$REPO/functest-kubernetes:$tag" .) + sudo docker push "$REPO/functest-kubernetes:$tag" + sudo docker rmi "$REPO/functest-kubernetes:$tag" + exit $? + +# parameter macro +- parameter: + name: functest-kubernetes-job-parameters + parameters: + - project-parameter: + project: '{project}' + branch: '{branch}' + - label: + name: SLAVE_LABEL + default: '{slave_label}' + description: 'Slave label on Jenkins' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' + - string: + name: PUSH_IMAGE + default: "true" + description: "To enable/disable pushing the image to Dockerhub." + - string: + name: COMMIT_ID + default: "" + description: "commit id to make a snapshot docker image" + - string: + name: GERRIT_REFNAME + default: "" + description: "Docker tag to be built, e.g. refs/tags/5.0.0, refs/tags/opnfv-5.0.0, refs/tags/5.0.RC1" + - string: + name: DOCKERFILE + default: "Dockerfile" + description: "Dockerfile to use for creating the image." + - string: + name: ARCH_TAG + default: "{arch_tag}" + description: "If set, this value will be added to the docker image tag as a prefix" + - string: + name: PROJECT + default: "{project}" + description: "Project name used to enable job conditions" + - string: + name: REPO + default: "opnfv" + description: "Repository name for functest images" + +- publisher: + name: 'functest-kubernetes-amd64-recipients' + publishers: + - email: + recipients: > + jalausuch@suse.com morgan.richomme@orange.com + cedric.ollivier@orange.com feng.xiaowei@zte.com.cn + juha.kosonen@nokia.com wangwulin@huawei.com + valentin.boucher@kontron.com 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/functest/functest-weekly-jobs.yml b/jjb/functest/functest-weekly-jobs.yml index 5d572aacc..d87ac2f76 100644 --- a/jjb/functest/functest-weekly-jobs.yml +++ b/jjb/functest/functest-weekly-jobs.yml @@ -16,11 +16,17 @@ gs-pathname: '' docker-tag: 'latest' disabled: false + fraser: &fraser + stream: fraser + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + docker-tag: '{stream}' + disabled: false euphrates: &euphrates stream: euphrates branch: 'stable/{stream}' gs-pathname: '/{stream}' - docker-tag: 'stable' + docker-tag: '{stream}' disabled: false # ------------------------------- # POD, INSTALLER, AND BRANCH MAPPING 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 @@ -20,6 +20,21 @@ 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: - label: @@ -66,6 +81,21 @@ 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: - label: 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/ovn4nfv/ovn4nfv-project-jobs.yml b/jjb/ovn4nfv/ovn4nfv-project-jobs.yml index 97d1baefd..0316ff70e 100644 --- a/jjb/ovn4nfv/ovn4nfv-project-jobs.yml +++ b/jjb/ovn4nfv/ovn4nfv-project-jobs.yml @@ -9,6 +9,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/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-arm.yml b/jjb/releng/opnfv-docker-arm.yml index fbf565844..9d79ea570 100644 --- a/jjb/releng/opnfv-docker-arm.yml +++ b/jjb/releng/opnfv-docker-arm.yml @@ -15,6 +15,10 @@ stream: euphrates branch: 'stable/{stream}' disabled: false + fraser: &fraser + stream: fraser + branch: 'stable/{stream}' + disabled: false dovetail-arm-receivers: &dovetail-arm-receivers receivers: > cristina.pauna@enea.com @@ -93,35 +97,35 @@ dockerdir: 'docker/storperf-master' docker_repo_name: 'opnfv/storperf-master' arch_tag: 'aarch64' - <<: *euphrates + <<: *fraser <<: *storperf-arm-receivers - 'storperf-graphite': project: 'storperf' dockerdir: 'docker/storperf-graphite' docker_repo_name: 'opnfv/storperf-graphite' arch_tag: 'aarch64' - <<: *euphrates + <<: *fraser <<: *storperf-arm-receivers - 'storperf-httpfrontend': project: 'storperf' dockerdir: 'docker/storperf-httpfrontend' docker_repo_name: 'opnfv/storperf-httpfrontend' arch_tag: 'aarch64' - <<: *euphrates + <<: *fraser <<: *storperf-arm-receivers - 'storperf-reporting': project: 'storperf' dockerdir: 'docker/storperf-reporting' docker_repo_name: 'opnfv/storperf-reporting' arch_tag: 'aarch64' - <<: *euphrates + <<: *fraser <<: *storperf-arm-receivers - 'storperf-swaggerui': project: 'storperf' dockerdir: 'docker/storperf-swaggerui' docker_repo_name: 'opnfv/storperf-swaggerui' arch_tag: 'aarch64' - <<: *euphrates + <<: *fraser <<: *storperf-arm-receivers - 'yardstick': project: 'yardstick' diff --git a/jjb/releng/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml index 55cbc5f1d..630a7ea22 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 @@ -130,10 +134,6 @@ project: 'yardstick' <<: *master <<: *other-receivers - - 'functest-kubernetes': - project: 'functest-kubernetes' - <<: *master - <<: *other-receivers # projects with jobs for euphrates - 'bottlenecks': project: 'bottlenecks' @@ -151,31 +151,31 @@ project: 'storperf' dockerdir: 'docker/storperf-master' arch_tag: 'x86_64' - <<: *euphrates + <<: *fraser <<: *storperf-receivers - 'storperf-graphite': project: 'storperf' dockerdir: 'docker/storperf-graphite' arch_tag: 'x86_64' - <<: *euphrates + <<: *fraser <<: *storperf-receivers - 'storperf-httpfrontend': project: 'storperf' dockerdir: 'docker/storperf-httpfrontend' arch_tag: 'x86_64' - <<: *euphrates + <<: *fraser <<: *storperf-receivers - 'storperf-reporting': project: 'storperf' dockerdir: 'docker/storperf-reporting' arch_tag: 'x86_64' - <<: *euphrates + <<: *fraser <<: *storperf-receivers - 'storperf-swaggerui': project: 'storperf' dockerdir: 'docker/storperf-swaggerui' arch_tag: 'x86_64' - <<: *euphrates + <<: *fraser <<: *storperf-receivers - 'yardstick': project: 'yardstick' 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/securedlab/check-jinja2.yml b/jjb/securedlab/check-jinja2.yml index 155be175d..f7a7941dc 100644 --- a/jjb/securedlab/check-jinja2.yml +++ b/jjb/securedlab/check-jinja2.yml @@ -15,7 +15,7 @@ - master: branch: '{stream}' disabled: false - - euphrates: + - fraser: branch: 'stable/{stream}' disabled: false diff --git a/jjb/sfc/sfc-project-jobs.yml b/jjb/sfc/sfc-project-jobs.yml index 82a2cfb5d..1fb4d990a 100644 --- a/jjb/sfc/sfc-project-jobs.yml +++ b/jjb/sfc/sfc-project-jobs.yml @@ -16,6 +16,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/jjb/snaps/snaps-verify-jobs.yml b/jjb/snaps/snaps-verify-jobs.yml index a6c86c966..44a1fbf67 100644 --- a/jjb/snaps/snaps-verify-jobs.yml +++ b/jjb/snaps/snaps-verify-jobs.yml @@ -16,6 +16,10 @@ branch: '{stream}' gs-pathname: '' disabled: true + - fraser: &fraser + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false - job-template: name: 'snaps-verify-{stream}' 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/jjb/xci/xci-run-functest.sh b/jjb/xci/xci-run-functest.sh index aa98e07aa..78b7d442c 100755 --- a/jjb/xci/xci-run-functest.sh +++ b/jjb/xci/xci-run-functest.sh @@ -55,12 +55,10 @@ export XCI_VENV=/home/devuser/releng-xci/venv ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm "source $XCI_VENV/bin/activate; cd releng-xci/xci && ansible-playbook -i installer/osa/files/$XCI_FLAVOR/inventory playbooks/prepare-functest.yml" echo "Running functest" ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm_opnfv "/root/run-functest.sh" +# Record exit code +functest_exit=$? echo "Functest log" echo "---------------------------------------------------------------------------------" ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm_opnfv "cat /root/results/functest.log" echo "---------------------------------------------------------------------------------" -# check the log to see if we have any error -if ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm_opnfv "grep -q 'FAIL' /root/results/functest.log"; then - echo "Error: Functest failed!" - exit 1 -fi +exit ${functest_exit} diff --git a/jjb/xci/xci-set-scenario.sh b/jjb/xci/xci-set-scenario.sh index c3012cd88..3e64ab140 100755 --- a/jjb/xci/xci-set-scenario.sh +++ b/jjb/xci/xci-set-scenario.sh @@ -96,22 +96,22 @@ function determine_generic_scenario() { # get the changeset cd $WORKSPACE - CHANGESET=$(git diff HEAD^..HEAD --name-only) - for CHANGED_FILE in $CHANGESET; do + SCENARIOS=$(git diff HEAD^..HEAD --name-only -- 'xci/scenarios' | cut -d "/" -f 3 | uniq) + # We need to set default scenario for changes that do not mess with scenarios + NO_SCENARIOS=$(git diff HEAD^..HEAD --name-only | grep -v 'xci/scenarios' | cut -d "/" -f 3 | uniq) + for CHANGED_SCENARIO in $SCENARIOS; do + [[ ${DEPLOY_SCENARIO[@]} =~ $CHANGED_SCENARIO ]] || DEPLOY_SCENARIO[${#DEPLOY_SCENARIO[@]}]=$CHANGED_SCENARIO + done + for CHANGED_FILE in $NO_SCENARIOS; do case $CHANGED_FILE in - *k8-nosdn*|*kubespray*) + kubespray) [[ ${DEPLOY_SCENARIO[@]} =~ "k8-nosdn-nofeature" ]] || DEPLOY_SCENARIO[${#DEPLOY_SCENARIO[@]}]='k8-nosdn-nofeature' ;; - *os-odl*) - [[ ${DEPLOY_SCENARIO[@]} =~ "os-odl-nofeature" ]] || DEPLOY_SCENARIO[${#DEPLOY_SCENARIO[@]}]='os-odl-nofeature' - ;; - *os-nosdn*|*osa*) - [[ ${DEPLOY_SCENARIO[@]} =~ "os-nosdn-nofeature" ]] || DEPLOY_SCENARIO[${#DEPLOY_SCENARIO[@]}]='os-nosdn-nofeature' - ;; + # Default case (including OSA changes) *) [[ ${DEPLOY_SCENARIO[@]} =~ "os-nosdn-nofeature" ]] || DEPLOY_SCENARIO[${#DEPLOY_SCENARIO[@]}]='os-nosdn-nofeature' ;; - esac + esac done # extract releng-xci sha |