diff options
Diffstat (limited to 'jjb')
42 files changed, 620 insertions, 1746 deletions
diff --git a/jjb/apex/apex-project-jobs.yaml b/jjb/apex/apex-project-jobs.yaml index 42567ea1b..c581c59ab 100644 --- a/jjb/apex/apex-project-jobs.yaml +++ b/jjb/apex/apex-project-jobs.yaml @@ -9,6 +9,11 @@ gs-pathname: '' concurrent-builds: 3 disabled: false + - hunter: &hunter + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + concurrent-builds: 3 + disabled: false - gambia: &gambia branch: 'stable/{stream}' gs-pathname: '/{stream}' diff --git a/jjb/apex/apex-verify-jobs.yaml b/jjb/apex/apex-verify-jobs.yaml index 23ce14f80..e8115ebf6 100644 --- a/jjb/apex/apex-verify-jobs.yaml +++ b/jjb/apex/apex-verify-jobs.yaml @@ -12,6 +12,11 @@ gs-pathname: '' verify-scenario: 'os-nosdn-nofeature-noha' disabled: false + - hunter: &hunter + branch: '{stream}' + gs-pathname: '' + verify-scenario: 'os-nosdn-nofeature-noha' + disabled: false - gambia: &gambia branch: 'stable/{stream}' gs-pathname: '/{stream}' diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index 85e9b182b..012d0bf1f 100644 --- a/jjb/apex/apex.yaml +++ b/jjb/apex/apex.yaml @@ -16,7 +16,6 @@ - 'apex-create-snapshot' - 'apex-fetch-snap-info' - 'apex-flex-daily-os-nosdn-nofeature-ha-{stream}' - - 'apex-dovetail-daily-os-nosdn-nofeature-ha-baremetal-danube' # stream: branch with - in place of / (eg. stable-arno) # branch: branch (eg. stable/arno) stream: @@ -29,7 +28,17 @@ verify-scenario: 'os-nosdn-nofeature-noha' scenario_stream: 'master' disable_daily: false - disable_promote: false + disable_promote: true + - hunter: &hunter + branch: 'stable/hunter' + gs-pathname: '/hunter' + build-slave: 'apex-build-master' + virtual-slave: 'apex-virtual-master' + baremetal-slave: 'apex-baremetal-master' + verify-scenario: 'os-nosdn-nofeature-ha' + scenario_stream: 'hunter' + disable_daily: false + disable_promote: true - gambia: &gambia branch: 'stable/gambia' gs-pathname: '/gambia' @@ -39,7 +48,7 @@ verify-scenario: 'os-nosdn-nofeature-ha' scenario_stream: 'gambia' disable_daily: true - disable_promote: false + disable_promote: true - fraser: &fraser branch: 'stable/fraser' gs-pathname: '/fraser' @@ -73,34 +82,6 @@ disable_promote: true scenario: - - 'os-nosdn-nofeature-ha': - <<: *fraser - - 'os-odl-bgpvpn-ha': - <<: *fraser - - 'os-nosdn-nofeature-noha': - <<: *gambia - - 'os-nosdn-nofeature-ha': - <<: *gambia - - 'os-nosdn-nofeature-ha-ipv6': - <<: *gambia - - 'os-odl-nofeature-noha': - <<: *gambia - - 'os-odl-nofeature-ha': - <<: *gambia - - 'k8s-nosdn-nofeature-noha': - <<: *gambia - - 'os-odl-bgpvpn-ha': - <<: *gambia - - 'os-odl-bgpvpn-noha': - <<: *gambia - - 'os-odl-sfc-ha': - <<: *gambia - - 'os-odl-sfc-noha': - <<: *gambia - - 'os-nosdn-calipso-noha': - <<: *gambia - - 'os-ovn-nofeature-ha': - <<: *gambia - 'os-nosdn-nofeature-noha': <<: *danube - 'os-nosdn-nofeature-ha': @@ -157,48 +138,40 @@ <<: *master - 'os-nosdn-nofeature-ha': <<: *master + - 'os-nosdn-nofeature-noha': + <<: *gambia + - 'os-nosdn-nofeature-ha': + <<: *gambia - 'os-nosdn-nofeature-ha-ipv6': - <<: *master + <<: *gambia - 'os-odl-nofeature-noha': - <<: *master + <<: *gambia - 'os-odl-nofeature-ha': - <<: *master - - 'os-nosdn-rocky-noha': - <<: *master - - 'os-nosdn-rocky-ha': - <<: *master - - 'os-nosdn-rocky-ha-ipv6': - <<: *master - - 'os-odl-rocky-noha': - <<: *master - - 'os-odl-rocky-ha': - <<: *master + <<: *gambia - 'k8s-nosdn-nofeature-noha': - <<: *master + <<: *gambia - 'os-odl-bgpvpn-ha': - <<: *master + <<: *gambia - 'os-odl-bgpvpn-noha': - <<: *master - - 'os-odl-bgpvpn_queens-ha': - <<: *master - - 'os-odl-bgpvpn_queens-noha': - <<: *master + <<: *gambia - 'os-odl-sfc-ha': - <<: *master + <<: *gambia - 'os-odl-sfc-noha': - <<: *master - - 'os-odl-sfc_rocky-ha': - <<: *master - - 'os-odl-sfc_rocky-noha': - <<: *master + <<: *gambia - 'os-nosdn-calipso-noha': - <<: *master - - 'os-nosdn-calipso_rocky-noha': - <<: *master + <<: *gambia - 'os-ovn-nofeature-ha': - <<: *master - - 'os-ovn-rocky-ha': - <<: *master + <<: *gambia + - 'os-nosdn-nofeature-ha': + <<: *fraser + - 'os-odl-bgpvpn-ha': + <<: *fraser + - 'os-nosdn-nofeature-noha': + <<: *hunter + - 'os-nosdn-nofeature-ha': + <<: *hunter + - 'os-ovn-nofeature-ha': + <<: *hunter - 'os-nosdn-nofeature-noha': <<: *euphrates - 'os-nosdn-nofeature-ha': @@ -685,7 +658,7 @@ abort-all-job: false git-revision: false - multijob: - name: Dovetail-proposed_tests + name: Dovetail-default-mandatory condition: ALWAYS projects: - name: 'dovetail-apex-baremetal-default-mandatory-{scenario_stream}' @@ -698,7 +671,7 @@ abort-all-job: false git-revision: false - multijob: - name: Dovetail-default + name: Dovetail-default-optional condition: ALWAYS projects: - name: 'dovetail-apex-baremetal-default-optional-{scenario_stream}' @@ -711,6 +684,19 @@ abort-all-job: false git-revision: false - multijob: + name: Dovetail-proposed_tests + condition: ALWAYS + projects: + - name: 'dovetail-apex-baremetal-proposed_tests-optional-{scenario_stream}' + node-parameters: true + current-parameters: false + predefined-parameters: + DEPLOY_SCENARIO=$DEPLOY_SCENARIO + kill-phase-on: NEVER + enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/" + abort-all-job: false + git-revision: false + - multijob: name: StorPerf condition: ALWAYS projects: @@ -1189,72 +1175,6 @@ abort-all-job: false git-revision: false -# Dovetail Danube test job -- job-template: - name: 'apex-dovetail-daily-os-nosdn-nofeature-ha-baremetal-danube' - - project-type: 'multijob' - - node: 'huawei-pod4' - - disabled: false - - parameters: - - '{project}-defaults' - - project-parameter: - project: '{project}' - branch: 'stable/danube' - - apex-parameter: - gs-pathname: '/danube' - - string: - name: DEPLOY_SCENARIO - default: 'os-nosdn-nofeature-ha' - description: "Scenario to deploy with." - - properties: - - logrotate-default - - build-blocker: - use-build-blocker: true - blocking-level: 'NODE' - blocking-jobs: - - 'apex-verify.*' - - 'apex-runner.*' - - 'apex-.*-promote.*' - - 'apex-run.*' - - triggers: - - timed: '' # '0 1 * * *' - - builders: - - description-setter: - description: "Testing on $NODE_NAME - Scenario: $DEPLOY_SCENARIO" - - multijob: - name: 'Baremetal Deploy' - condition: SUCCESSFUL - projects: - - name: 'apex-deploy-baremetal-danube' - node-parameters: true - current-parameters: true - predefined-parameters: | - OPNFV_CLEAN=yes - GERRIT_BRANCH=$GERRIT_BRANCH - GERRIT_REFSPEC= - DEPLOY_SCENARIO=$DEPLOY_SCENARIO - kill-phase-on: FAILURE - abort-all-job: true - git-revision: false - - multijob: - name: Dovetail - condition: ALWAYS - projects: - - name: 'dovetail-apex-baremetal-proposed_tests-danube' - node-parameters: true - current-parameters: false - predefined-parameters: - DEPLOY_SCENARIO=$DEPLOY_SCENARIO - kill-phase-on: NEVER - abort-all-job: false - git-revision: false ######################## # parameter macros @@ -1301,136 +1221,6 @@ # 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-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-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 - -# gambia Builder -- builder: - name: apex-builder-gambia - builders: - - multijob: - name: Baremetal Deploy and Test Phase - condition: SUCCESSFUL - projects: - - name: 'apex-os-nosdn-nofeature-noha-baremetal-gambia' - 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-gambia' - 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-gambia' - 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-gambia' - 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-gambia' - node-parameters: false - current-parameters: false - predefined-parameters: | - OPNFV_CLEAN=yes - kill-phase-on: NEVER - abort-all-job: true - git-revision: false - - name: 'apex-k8s-nosdn-nofeature-noha-baremetal-gambia' - 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-gambia' - 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-noha-baremetal-gambia' - 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-gambia' - 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-gambia' - 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-gambia' - 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-ha-baremetal-gambia' - 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 @@ -1672,39 +1462,16 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-nofeature-ha-ipv6-baremetal-master' - 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-master' - 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-master' - 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-rocky-noha-baremetal-master' - 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-rocky-ha-baremetal-master' + +# gambia Builder +- builder: + name: apex-builder-gambia + builders: + - multijob: + name: Baremetal Deploy and Test Phase + condition: SUCCESSFUL + projects: + - name: 'apex-os-nosdn-nofeature-noha-baremetal-gambia' node-parameters: false current-parameters: false predefined-parameters: | @@ -1712,7 +1479,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-rocky-ha-ipv6-baremetal-master' + - name: 'apex-os-nosdn-nofeature-ha-baremetal-gambia' node-parameters: false current-parameters: false predefined-parameters: | @@ -1720,7 +1487,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-rocky-noha-baremetal-master' + - name: 'apex-os-nosdn-nofeature-ha-ipv6-baremetal-gambia' node-parameters: false current-parameters: false predefined-parameters: | @@ -1728,7 +1495,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-rocky-ha-baremetal-master' + - name: 'apex-os-odl-nofeature-noha-baremetal-gambia' node-parameters: false current-parameters: false predefined-parameters: | @@ -1736,7 +1503,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-k8s-nosdn-nofeature-noha-baremetal-master' + - name: 'apex-os-odl-nofeature-ha-baremetal-gambia' node-parameters: false current-parameters: false predefined-parameters: | @@ -1744,7 +1511,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-bgpvpn-ha-baremetal-master' + - name: 'apex-k8s-nosdn-nofeature-noha-baremetal-gambia' node-parameters: false current-parameters: false predefined-parameters: | @@ -1752,7 +1519,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-bgpvpn-noha-baremetal-master' + - name: 'apex-os-odl-bgpvpn-ha-baremetal-gambia' node-parameters: false current-parameters: false predefined-parameters: | @@ -1760,7 +1527,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-bgpvpn_queens-ha-baremetal-master' + - name: 'apex-os-odl-bgpvpn-noha-baremetal-gambia' node-parameters: false current-parameters: false predefined-parameters: | @@ -1768,7 +1535,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-bgpvpn_queens-noha-baremetal-master' + - name: 'apex-os-odl-sfc-ha-baremetal-gambia' node-parameters: false current-parameters: false predefined-parameters: | @@ -1776,7 +1543,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-sfc-ha-baremetal-master' + - name: 'apex-os-odl-sfc-noha-baremetal-gambia' node-parameters: false current-parameters: false predefined-parameters: | @@ -1784,7 +1551,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-sfc-noha-baremetal-master' + - name: 'apex-os-nosdn-calipso-noha-baremetal-gambia' node-parameters: false current-parameters: false predefined-parameters: | @@ -1792,7 +1559,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-sfc_rocky-ha-baremetal-master' + - name: 'apex-os-ovn-nofeature-ha-baremetal-gambia' node-parameters: false current-parameters: false predefined-parameters: | @@ -1800,7 +1567,16 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-odl-sfc_rocky-noha-baremetal-master' + +# fraser Builder +- builder: + name: apex-builder-fraser + builders: + - multijob: + name: Baremetal Deploy and Test Phase + condition: SUCCESSFUL + projects: + - name: 'apex-os-nosdn-nofeature-ha-baremetal-fraser' node-parameters: false current-parameters: false predefined-parameters: | @@ -1808,7 +1584,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-calipso-noha-baremetal-master' + - name: 'apex-os-odl-bgpvpn-ha-baremetal-fraser' node-parameters: false current-parameters: false predefined-parameters: | @@ -1816,7 +1592,16 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-calipso_rocky-noha-baremetal-master' + +# hunter Builder +- builder: + name: apex-builder-hunter + builders: + - multijob: + name: Baremetal Deploy and Test Phase + condition: SUCCESSFUL + projects: + - name: 'apex-os-nosdn-nofeature-noha-baremetal-hunter' node-parameters: false current-parameters: false predefined-parameters: | @@ -1824,7 +1609,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-ovn-nofeature-ha-baremetal-master' + - name: 'apex-os-nosdn-nofeature-ha-baremetal-hunter' node-parameters: false current-parameters: false predefined-parameters: | @@ -1832,7 +1617,7 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-ovn-rocky-ha-baremetal-master' + - name: 'apex-os-ovn-nofeature-ha-baremetal-hunter' node-parameters: false current-parameters: false predefined-parameters: | @@ -2019,6 +1804,11 @@ - timed: '0 0 1-31/2 * *' - trigger: + name: 'apex-hunter' + triggers: + - timed: '0 4 2-30/2 * *' + +- trigger: name: 'apex-gambia' triggers: - timed: '0 4 2-30/2 * *' @@ -2054,6 +1844,21 @@ - timed: '' - trigger: + name: 'hunter-csit-master' + triggers: + - timed: '' + +- trigger: + name: 'hunter-csit-rocky' + triggers: + - timed: '0 5 * * *' + +- trigger: + name: 'hunter-csit-queens' + triggers: + - timed: '' + +- trigger: name: 'gambia-csit-master' triggers: - timed: '' @@ -2128,6 +1933,21 @@ - timed: '' - trigger: + name: 'hunter-functest-master' + triggers: + - timed: '' + +- trigger: + name: 'hunter-functest-rocky' + triggers: + - timed: '0 3 * * *' + +- trigger: + name: 'hunter-functest-queens' + triggers: + - timed: '' + +- trigger: name: 'gambia-functest-master' triggers: - timed: '' diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2 index aaa166e25..90bfb1f91 100644 --- a/jjb/apex/apex.yaml.j2 +++ b/jjb/apex/apex.yaml.j2 @@ -16,7 +16,6 @@ - 'apex-create-snapshot' - 'apex-fetch-snap-info' - 'apex-flex-daily-os-nosdn-nofeature-ha-{stream}' - - 'apex-dovetail-daily-os-nosdn-nofeature-ha-baremetal-danube' # stream: branch with - in place of / (eg. stable-arno) # branch: branch (eg. stable/arno) stream: @@ -29,7 +28,17 @@ verify-scenario: 'os-nosdn-nofeature-noha' scenario_stream: 'master' disable_daily: false - disable_promote: false + disable_promote: true + - hunter: &hunter + branch: 'stable/hunter' + gs-pathname: '/hunter' + build-slave: 'apex-build-master' + virtual-slave: 'apex-virtual-master' + baremetal-slave: 'apex-baremetal-master' + verify-scenario: 'os-nosdn-nofeature-ha' + scenario_stream: 'hunter' + disable_daily: false + disable_promote: true - gambia: &gambia branch: 'stable/gambia' gs-pathname: '/gambia' @@ -39,7 +48,7 @@ verify-scenario: 'os-nosdn-nofeature-ha' scenario_stream: 'gambia' disable_daily: true - disable_promote: false + disable_promote: true - fraser: &fraser branch: 'stable/fraser' gs-pathname: '/fraser' @@ -531,7 +540,7 @@ abort-all-job: false git-revision: false - multijob: - name: Dovetail-proposed_tests + name: Dovetail-default-mandatory condition: ALWAYS projects: - name: 'dovetail-apex-baremetal-default-mandatory-{scenario_stream}' @@ -544,7 +553,7 @@ abort-all-job: false git-revision: false - multijob: - name: Dovetail-default + name: Dovetail-default-optional condition: ALWAYS projects: - name: 'dovetail-apex-baremetal-default-optional-{scenario_stream}' @@ -557,6 +566,19 @@ abort-all-job: false git-revision: false - multijob: + name: Dovetail-proposed_tests + condition: ALWAYS + projects: + - name: 'dovetail-apex-baremetal-proposed_tests-optional-{scenario_stream}' + node-parameters: true + current-parameters: false + predefined-parameters: + DEPLOY_SCENARIO=$DEPLOY_SCENARIO + kill-phase-on: NEVER + enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/" + abort-all-job: false + git-revision: false + - multijob: name: StorPerf condition: ALWAYS projects: @@ -1035,72 +1057,6 @@ abort-all-job: false git-revision: false -# Dovetail Danube test job -- job-template: - name: 'apex-dovetail-daily-os-nosdn-nofeature-ha-baremetal-danube' - - project-type: 'multijob' - - node: 'huawei-pod4' - - disabled: false - - parameters: - - '{project}-defaults' - - project-parameter: - project: '{project}' - branch: 'stable/danube' - - apex-parameter: - gs-pathname: '/danube' - - string: - name: DEPLOY_SCENARIO - default: 'os-nosdn-nofeature-ha' - description: "Scenario to deploy with." - - properties: - - logrotate-default - - build-blocker: - use-build-blocker: true - blocking-level: 'NODE' - blocking-jobs: - - 'apex-verify.*' - - 'apex-runner.*' - - 'apex-.*-promote.*' - - 'apex-run.*' - - triggers: - - timed: '' # '0 1 * * *' - - builders: - - description-setter: - description: "Testing on $NODE_NAME - Scenario: $DEPLOY_SCENARIO" - - multijob: - name: 'Baremetal Deploy' - condition: SUCCESSFUL - projects: - - name: 'apex-deploy-baremetal-danube' - node-parameters: true - current-parameters: true - predefined-parameters: | - OPNFV_CLEAN=yes - GERRIT_BRANCH=$GERRIT_BRANCH - GERRIT_REFSPEC= - DEPLOY_SCENARIO=$DEPLOY_SCENARIO - kill-phase-on: FAILURE - abort-all-job: true - git-revision: false - - multijob: - name: Dovetail - condition: ALWAYS - projects: - - name: 'dovetail-apex-baremetal-proposed_tests-danube' - node-parameters: true - current-parameters: false - predefined-parameters: - DEPLOY_SCENARIO=$DEPLOY_SCENARIO - kill-phase-on: NEVER - abort-all-job: false - git-revision: false ######################## # parameter macros @@ -1201,6 +1157,11 @@ - timed: '0 0 1-31/2 * *' - trigger: + name: 'apex-hunter' + triggers: + - timed: '0 4 2-30/2 * *' + +- trigger: name: 'apex-gambia' triggers: - timed: '0 4 2-30/2 * *' @@ -1236,6 +1197,21 @@ - timed: '' - trigger: + name: 'hunter-csit-master' + triggers: + - timed: '' + +- trigger: + name: 'hunter-csit-rocky' + triggers: + - timed: '0 5 * * *' + +- trigger: + name: 'hunter-csit-queens' + triggers: + - timed: '' + +- trigger: name: 'gambia-csit-master' triggers: - timed: '' @@ -1310,6 +1286,21 @@ - timed: '' - trigger: + name: 'hunter-functest-master' + triggers: + - timed: '' + +- trigger: + name: 'hunter-functest-rocky' + triggers: + - timed: '0 3 * * *' + +- trigger: + name: 'hunter-functest-queens' + triggers: + - timed: '' + +- trigger: name: 'gambia-functest-master' triggers: - timed: '' diff --git a/jjb/apex/scenarios.yaml.hidden b/jjb/apex/scenarios.yaml.hidden index a221699f1..d9d32b473 100644 --- a/jjb/apex/scenarios.yaml.hidden +++ b/jjb/apex/scenarios.yaml.hidden @@ -1,27 +1,10 @@ master: - 'os-nosdn-nofeature-noha' - 'os-nosdn-nofeature-ha' - - 'os-nosdn-nofeature-ha-ipv6' - - 'os-odl-nofeature-noha' - - 'os-odl-nofeature-ha' - - 'os-nosdn-rocky-noha' - - 'os-nosdn-rocky-ha' - - 'os-nosdn-rocky-ha-ipv6' - - 'os-odl-rocky-noha' - - 'os-odl-rocky-ha' - - 'k8s-nosdn-nofeature-noha' - - 'os-odl-bgpvpn-ha' - - 'os-odl-bgpvpn-noha' - - 'os-odl-bgpvpn_queens-ha' - - 'os-odl-bgpvpn_queens-noha' - - 'os-odl-sfc-ha' - - 'os-odl-sfc-noha' - - 'os-odl-sfc_rocky-ha' - - 'os-odl-sfc_rocky-noha' - - 'os-nosdn-calipso-noha' - - 'os-nosdn-calipso_rocky-noha' +hunter: + - 'os-nosdn-nofeature-noha' + - 'os-nosdn-nofeature-ha' - 'os-ovn-nofeature-ha' - - 'os-ovn-rocky-ha' gambia: - 'os-nosdn-nofeature-noha' - 'os-nosdn-nofeature-ha' diff --git a/jjb/armband/armband-ci-jobs.yaml b/jjb/armband/armband-ci-jobs.yaml index a100f49b4..0e99cfbdd 100644 --- a/jjb/armband/armband-ci-jobs.yaml +++ b/jjb/armband/armband-ci-jobs.yaml @@ -3,6 +3,7 @@ - project: name: 'armband-ci' project: 'armband' + installer: 'fuel' # ------------------------------- # BRANCH ANCHORS @@ -13,302 +14,59 @@ gs-pathname: '' disabled: false functest_docker_tag: hunter - fraser: &fraser - stream: fraser - branch: 'stable/{stream}' - disabled: false - gs-pathname: '/{stream}' - functest_docker_tag: '{stream}' - gambia: &gambia - stream: gambia + hunter: &hunter + stream: hunter branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: true functest_docker_tag: '{stream}' # ------------------------------- - # DEPLOY TYPE ANCHORS - # ------------------------------- - baremetal: &baremetal - installer: 'fuel' - deploy-type: 'baremetal' - slave-label: 'armband-{deploy-type}' - virtual: &virtual - installer: 'fuel' - deploy-type: 'virtual' - slave-label: 'armband-{deploy-type}' - # ------------------------------- # POD, INSTALLER, AND BRANCH MAPPING # ------------------------------- # CI POD's # ------------------------------- - # yamllint disable rule:key-duplicates pod: # ------------------------------- - # fraser - # ------------------------------- - - armband-baremetal: - <<: *baremetal - <<: *fraser - # ------------------------------- - # gambia + # hunter # ------------------------------- - armband-baremetal: - <<: *baremetal - <<: *gambia - - armband-virtual: - <<: *virtual - <<: *gambia + deploy-type: 'baremetal' + slave-label: 'armband-{deploy-type}' + <<: *hunter # ------------------------------- # master # ------------------------------- - armband-baremetal: - <<: *baremetal + deploy-type: 'baremetal' + slave-label: 'armband-{deploy-type}' <<: *master - - armband-virtual: - <<: *virtual - <<: *master - # yamllint enable rule:key-duplicates # ------------------------------- # scenarios # ------------------------------- scenario: # HA scenarios - 'os-nosdn-nofeature-ha': - auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger' + auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger' - 'os-odl-nofeature-ha': - auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger' + auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger' - 'os-ovn-nofeature-ha': - auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger' + auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger' - 'os-nosdn-ovs-ha': - auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger' + auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger' # NOHA scenarios - 'os-nosdn-nofeature-noha': - auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger' + auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger' - 'os-nosdn-fdio-noha': - auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger' - - exclude: - # Dovetail (and only it) should run against Fraser HA baremetal scenarios - - scenario: os-nosdn-nofeature-noha - stream: fraser - - scenario: os-ovn-nofeature-ha - stream: fraser - - scenario: os-nosdn-fdio-noha - stream: fraser + auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger' jobs: - - '{installer}-{scenario}-{pod}-daily-{stream}' - - '{installer}-deploy-{pod}-daily-{stream}' + - 'fuel-{scenario}-{pod}-daily-{stream}' + - 'fuel-deploy-{pod}-daily-{stream}' ######################## -# job templates +# job templates: Armband uses Fuel's job templates, no need to duplicate ######################## -- job-template: - name: '{installer}-{scenario}-{pod}-daily-{stream}' - - disabled: '{obj:disabled}' - - concurrent: false - - properties: - - logrotate-default - - throttle: - enabled: true - max-total: 4 - max-per-node: 1 - option: 'project' - - build-blocker: - use-build-blocker: true - blocking-jobs: - - '{installer}-os-.*?-{pod}-daily-.*' - - 'armband-verify-.*' - blocking-level: 'NODE' - - wrappers: - - build-name: - name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' - - triggers: - - '{auto-trigger-name}' - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - '{installer}-defaults': - gs-pathname: '{gs-pathname}' - - '{slave-label}-defaults': - installer: '{installer}' - - string: - name: DEPLOY_SCENARIO - default: '{scenario}' - - builders: - - trigger-builds: - - project: '{installer}-deploy-{pod}-daily-{stream}' - current-parameters: false - predefined-parameters: | - DEPLOY_SCENARIO={scenario} - INSTALLER_VERSION={stream} - same-node: true - block: true - - conditional-step: - condition-kind: not - condition-operand: - condition-kind: regex-match - regex: 'fraser' - label: '{stream}' - steps: - - trigger-builds: - - project: 'functest-{installer}-{pod}-daily-{stream}' - current-parameters: false - predefined-parameters: | - DEPLOY_SCENARIO={scenario} - INSTALLER_VERSION={stream} - DOCKER_TAG={functest_docker_tag} - same-node: true - block: true - block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'FAILURE' - - conditional-step: - condition-kind: not - condition-operand: - condition-kind: regex-match - regex: 'fraser' - label: '{stream}' - steps: - - trigger-builds: - - project: 'yardstick-{installer}-{pod}-daily-{stream}' - current-parameters: false - predefined-parameters: | - DEPLOY_SCENARIO={scenario} - INSTALLER_VERSION={stream} - block: true - same-node: true - block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'FAILURE' - # 1.here the stream means the SUT stream, dovetail stream is defined in its own job - # 2.testsuite proposed_tests here is for new test cases planning to add into OVP - # 3.run proposed_tests on Monday, Wednesday and Friday against ha scenario - # 4.testsuite default here is for the test cases already added into OVP - # 5.run default testsuite on Tuesday against ha scenario - # 6.not used for release criteria or compliance, - # only to debug the dovetail tool bugs with arm pods - - conditional-step: - condition-kind: and - condition-operands: - - condition-kind: regex-match - regex: '.*-ha' - label: '{scenario}' - - condition-kind: regex-match - regex: 'fraser' - label: '{stream}' - steps: - - trigger-builds: - - project: 'dovetail-{installer}-{pod}-proposed_tests-{stream}' - current-parameters: false - predefined-parameters: | - DEPLOY_SCENARIO={scenario} - INSTALLER_VERSION={stream} - block: true - same-node: true - block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'FAILURE' - - conditional-step: - condition-kind: and - condition-operands: - - condition-kind: regex-match - regex: '.*-ha' - label: '{scenario}' - - condition-kind: regex-match - regex: 'fraser' - label: '{stream}' - steps: - - trigger-builds: - - project: 'dovetail-{installer}-{pod}-default-{stream}' - current-parameters: false - predefined-parameters: | - DEPLOY_SCENARIO={scenario} - INSTALLER_VERSION={stream} - block: true - same-node: true - block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'FAILURE' - # Armband uses Fuel's log collection project job, no need to duplicate - - trigger-builds: - - project: 'fuel-collect-logs-{deploy-type}-daily-{stream}' - current-parameters: false - predefined-parameters: | - DEPLOY_SCENARIO={scenario} - INSTALLER_VERSION={stream} - block: true - same-node: true - block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'FAILURE' - -- job-template: - name: '{installer}-deploy-{pod}-daily-{stream}' - - concurrent: true - - properties: - - logrotate-default - - throttle: - enabled: true - max-total: 4 - max-per-node: 1 - option: 'project' - - build-blocker: - use-build-blocker: true - blocking-jobs: - - '{installer}-deploy-{pod}-daily-{stream}' - - '{installer}-deploy-generic-daily-.*' - blocking-level: 'NODE' - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - '{installer}-defaults': - gs-pathname: '{gs-pathname}' - - '{slave-label}-defaults': - installer: '{installer}' - - testapi-parameter - - string: - name: DEPLOY_SCENARIO - default: 'os-odl-nofeature-ha' - - string: - name: PROJECT - default: '{project}' - - scm: - - git-scm - - wrappers: - - build-name: - name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' - - builders: - - track-begin-timestamp - - shell: - !include-raw-escape: ../fuel/fuel-deploy.sh - - publishers: - - email: - recipients: armband@enea.com - - email-jenkins-admins-on-failure - - report-provision-result ######################## # trigger macros @@ -342,98 +100,29 @@ triggers: - timed: '0 1 * * 3,5' # --------------------------------------------------------------------- -# Enea Armband CI Baremetal Triggers running against gambia branch +# Enea Armband CI Baremetal Triggers running against hunter branch # --------------------------------------------------------------------- - trigger: - name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-gambia-trigger' + name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-hunter-trigger' triggers: - timed: '10 1 * * 1' - trigger: - name: 'fuel-os-odl-nofeature-ha-armband-baremetal-gambia-trigger' + name: 'fuel-os-odl-nofeature-ha-armband-baremetal-hunter-trigger' triggers: - timed: '10 1 * * 7' - trigger: - name: 'fuel-os-ovn-nofeature-ha-armband-baremetal-gambia-trigger' + name: 'fuel-os-ovn-nofeature-ha-armband-baremetal-hunter-trigger' triggers: - timed: '10 1 * * 2' - trigger: - name: 'fuel-os-nosdn-ovs-ha-armband-baremetal-gambia-trigger' + name: 'fuel-os-nosdn-ovs-ha-armband-baremetal-hunter-trigger' triggers: - timed: '10 1 * * 4,6' - trigger: - name: 'fuel-os-nosdn-nofeature-noha-armband-baremetal-gambia-trigger' + name: 'fuel-os-nosdn-nofeature-noha-armband-baremetal-hunter-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-fdio-noha-armband-baremetal-gambia-trigger' + name: 'fuel-os-nosdn-fdio-noha-armband-baremetal-hunter-trigger' triggers: - timed: '10 1 * * 3,5' -# ------------------------------------------------------------------- -# Enea Armband CI Baremetal Triggers running against fraser branch (for Dovetail) -# ------------------------------------------------------------------- -- trigger: - name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-fraser-trigger' - triggers: - - timed: '5 13 * * 6,7' -- trigger: - name: 'fuel-os-odl-nofeature-ha-armband-baremetal-fraser-trigger' - triggers: - - timed: '0 13 * * 6' -- trigger: - name: 'fuel-os-nosdn-ovs-ha-armband-baremetal-fraser-trigger' - triggers: - - timed: '0 13 * * 7' -# -------------------------------------------------------------- -# Enea Armband CI Virtual Triggers running against master branch -# -------------------------------------------------------------- -- trigger: - name: 'fuel-os-nosdn-nofeature-ha-armband-virtual-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'fuel-os-odl-nofeature-ha-armband-virtual-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'fuel-os-ovn-nofeature-ha-armband-virtual-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'fuel-os-nosdn-ovs-ha-armband-virtual-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'fuel-os-nosdn-nofeature-noha-armband-virtual-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'fuel-os-nosdn-fdio-noha-armband-virtual-master-trigger' - triggers: - - timed: '' -# ------------------------------------------------------------------- -# Enea Armband CI Virtual Triggers running against gambia branch -# ------------------------------------------------------------------- -- trigger: - name: 'fuel-os-nosdn-nofeature-ha-armband-virtual-gambia-trigger' - triggers: - - timed: '' -- trigger: - name: 'fuel-os-odl-nofeature-ha-armband-virtual-gambia-trigger' - triggers: - - timed: '' -- trigger: - name: 'fuel-os-ovn-nofeature-ha-armband-virtual-gambia-trigger' - triggers: - - timed: '' -- trigger: - name: 'fuel-os-nosdn-ovs-ha-armband-virtual-gambia-trigger' - triggers: - - timed: '' -- trigger: - name: 'fuel-os-nosdn-nofeature-noha-armband-virtual-gambia-trigger' - triggers: - - timed: '' -- trigger: - name: 'fuel-os-nosdn-fdio-noha-armband-virtual-gambia-trigger' - triggers: - - timed: '' diff --git a/jjb/auto/auto.yaml b/jjb/auto/auto.yaml index 84bb6141c..3b47c47ee 100644 --- a/jjb/auto/auto.yaml +++ b/jjb/auto/auto.yaml @@ -43,8 +43,8 @@ auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger' jobs: - - '{installer}-{scenario}-{pod}-auto-daily-{stream}' - - '{installer}-deploy-{pod}-daily-{stream}' + - 'fuel-{scenario}-{pod}-auto-daily-{stream}' + - 'fuel-deploy-{pod}-daily-{stream}' - 'auto-daily-{stream}' - 'auto-verify-{stream}' - 'auto-merge-{stream}' @@ -53,7 +53,7 @@ # job templates ######################## - job-template: - name: '{installer}-{scenario}-{pod}-auto-daily-{stream}' + name: 'fuel-{scenario}-{pod}-auto-daily-{stream}' disabled: '{obj:disabled}' @@ -69,7 +69,7 @@ - build-blocker: use-build-blocker: true blocking-jobs: - - '{installer}-os-.*?-{pod}-auto-daily-.*' + - 'fuel-os-.*?-{pod}-auto-daily-.*' blocking-level: 'NODE' wrappers: @@ -93,7 +93,7 @@ builders: - trigger-builds: - - project: '{installer}-deploy-{pod}-daily-{stream}' + - project: 'fuel-deploy-{pod}-daily-{stream}' current-parameters: false predefined-parameters: | DEPLOY_SCENARIO=os-nosdn-nofeature-ha diff --git a/jjb/compass4nfv/compass-ci-jobs.yaml b/jjb/compass4nfv/compass-ci-jobs.yaml index 9dc80748d..467210201 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yaml +++ b/jjb/compass4nfv/compass-ci-jobs.yaml @@ -219,6 +219,7 @@ # only run on os-(nosdn|odl_l3)-nofeature-ha scenario # run with testsuite default, testarea mandatory, dovetail docker image with latest tag # run with testsuite default, testarea optional, dovetail docker image with latest tag + # run with testsuite proposed_tests, testarea optional, dovetail docker image with latest tag - conditional-step: condition-kind: and condition-operands: @@ -238,14 +239,6 @@ build-step-failure-threshold: 'never' failure-threshold: 'never' unstable-threshold: 'FAILURE' - - conditional-step: - condition-kind: and - condition-operands: - - condition-kind: regex-match - regex: os-(nosdn|odl_l3)-nofeature-ha - label: '{scenario}' - steps: - - trigger-builds: - project: 'dovetail-compass-{pod}-default-optional-{stream}' current-parameters: false predefined-parameters: | @@ -257,6 +250,17 @@ build-step-failure-threshold: 'never' failure-threshold: 'never' unstable-threshold: 'FAILURE' + - project: 'dovetail-compass-{pod}-proposed_tests-optional-{stream}' + current-parameters: false + predefined-parameters: | + DOCKER_TAG=latest + DEPLOY_SCENARIO={scenario} + block: true + same-node: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' - conditional-step: condition-kind: and condition-operands: diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh index 04b11fdd1..ef11fc15a 100755 --- a/jjb/dovetail/dovetail-run.sh +++ b/jjb/dovetail/dovetail-run.sh @@ -35,6 +35,8 @@ ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" sshkey="" +TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results + check_file_exists() { if [[ -f $1 ]]; then echo 0 @@ -402,7 +404,10 @@ fi echo "Dovetail: Pulling image ${DOCKER_REPO}:${DOCKER_TAG}" docker pull ${DOCKER_REPO}:$DOCKER_TAG >$redirect -cmd="docker run ${opts} -e DOVETAIL_HOME=${DOVETAIL_HOME} ${docker_volume} ${dovetail_home_volume} \ +cmd="docker run ${opts} -e DOVETAIL_HOME=${DOVETAIL_HOME} -e INSTALLER_TYPE=${INSTALLER_TYPE} \ + -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} -e NODE_NAME=${NODE_NAME} -e BUILD_TAG=${BUILD_TAG} \ + -e TEST_DB_URL=${TEST_DB_URL} -e VERSION=${SUT_BRANCH} \ + ${docker_volume} ${dovetail_home_volume} \ ${sshkey} ${DOCKER_REPO}:${DOCKER_TAG} /bin/bash" echo "Dovetail: running docker run command: ${cmd}" ${cmd} >${redirect} @@ -462,7 +467,7 @@ else testarea="--testarea ${TESTAREA}" fi -run_cmd="dovetail run ${testsuite} ${testarea} --deploy-scenario ${DEPLOY_SCENARIO} -d -r" +run_cmd="dovetail run ${testsuite} ${testarea} --deploy-scenario ${DEPLOY_SCENARIO} -d -r --opnfv-ci" echo "Container exec command: ${run_cmd}" docker exec $container_id ${run_cmd} diff --git a/jjb/fuel/fuel-daily-jobs.yaml b/jjb/fuel/fuel-daily-jobs.yaml index 982b83e09..e5674933d 100644 --- a/jjb/fuel/fuel-daily-jobs.yaml +++ b/jjb/fuel/fuel-daily-jobs.yaml @@ -17,18 +17,12 @@ disabled: false gs-pathname: '' functest_docker_tag: hunter - fraser: &fraser - stream: fraser + hunter: &hunter + stream: hunter branch: 'stable/{stream}' disabled: false gs-pathname: '/{stream}' functest_docker_tag: '{stream}' - gambia: &gambia - stream: gambia - branch: 'stable/{stream}' - disabled: true - gs-pathname: '/{stream}' - functest_docker_tag: '{stream}' # ------------------------------- # POD, INSTALLER, AND BRANCH MAPPING # ------------------------------- @@ -43,13 +37,10 @@ <<: *master - baremetal: slave-label: fuel-baremetal - <<: *gambia + <<: *hunter - virtual: slave-label: fuel-virtual - <<: *gambia - - baremetal: - slave-label: fuel-baremetal - <<: *fraser + <<: *hunter # ------------------------------- # None-CI PODs # ------------------------------- @@ -88,29 +79,8 @@ auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger' - 'os-nosdn-fdio-noha': auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger' - - exclude: - # Dovetail (and only it) should run against Fraser HA baremetal scenarios - - scenario: os-nosdn-nofeature-noha - stream: fraser - - scenario: os-odl-nofeature-noha - stream: fraser - - scenario: os-odl-sfc-noha - stream: fraser - - scenario: os-odl-bgpvpn-noha - stream: fraser - - scenario: os-odl-ovs-noha - stream: fraser - - scenario: os-ovn-nofeature-noha - stream: fraser - - scenario: os-nosdn-ovs-noha - stream: fraser - - scenario: os-nosdn-fdio-noha - stream: fraser - - scenario: os-ovn-nofeature-ha - stream: fraser - - scenario: os-nosdn-fdio-ha - stream: fraser + - 'k8-calico-nofeature-noha': + auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger' jobs: - 'fuel-{scenario}-{pod}-daily-{stream}' @@ -137,7 +107,7 @@ - build-blocker: use-build-blocker: true blocking-jobs: - - 'fuel-os-.*?-{pod}-daily-.*' + - 'fuel-(os|k8)-.*?-{pod}-daily-.*' - 'fuel-verify-.*' blocking-level: 'NODE' @@ -171,94 +141,31 @@ INSTALLER_VERSION={stream} same-node: true block: true - - conditional-step: - condition-kind: not - condition-operand: - condition-kind: regex-match - regex: 'fraser' - label: '{stream}' - steps: - - trigger-builds: - - project: 'functest-fuel-{pod}-daily-{stream}' - current-parameters: false - predefined-parameters: | - DEPLOY_SCENARIO={scenario} - INSTALLER_VERSION={stream} - DOCKER_TAG={functest_docker_tag} - same-node: true - block: true - block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'FAILURE' - - conditional-step: - condition-kind: not - condition-operand: - condition-kind: regex-match - regex: 'fraser' - label: '{stream}' - steps: - - trigger-builds: - - project: 'yardstick-fuel-{pod}-daily-{stream}' - current-parameters: false - predefined-parameters: | - DEPLOY_SCENARIO={scenario} - INSTALLER_VERSION={stream} - block: true - same-node: true - block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'FAILURE' - # 1.here the stream means the SUT stream, dovetail stream is defined in its own job - # 2.testsuite default here is for the test cases already added into OVP - # 3.run default testsuite mandatory test cases against ha scenario - # 4.run default testsuite optional test cases against ha scenario twice one week - # 5.not used for release criteria or compliance, only to debug the dovetail tool bugs - - conditional-step: - condition-kind: and - condition-operands: - - condition-kind: regex-match - regex: '.*-ha' - label: '{scenario}' - steps: - - trigger-builds: - - project: 'dovetail-fuel-{pod}-default-mandatory-{stream}' - current-parameters: false - predefined-parameters: | - DEPLOY_SCENARIO={scenario} - INSTALLER_VERSION={stream} - block: true - same-node: true - block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'FAILURE' - - conditional-step: - condition-kind: and - condition-operands: - - condition-kind: regex-match - regex: '.*-ha' - label: '{scenario}' - - condition-kind: day-of-week - day-selector: select-days - days: - MON: true - WED: true - use-build-time: true - steps: - - trigger-builds: - - project: 'dovetail-fuel-{pod}-default-optional-{stream}' - current-parameters: false - predefined-parameters: | - DEPLOY_SCENARIO={scenario} - INSTALLER_VERSION={stream} - block: true - same-node: true - block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'FAILURE' + - trigger-builds: + - project: 'functest-fuel-{pod}-daily-{stream}' + current-parameters: false + predefined-parameters: | + DEPLOY_SCENARIO={scenario} + INSTALLER_VERSION={stream} + DOCKER_TAG={functest_docker_tag} + same-node: true + block: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' + - trigger-builds: + - project: 'yardstick-fuel-{pod}-daily-{stream}' + current-parameters: false + predefined-parameters: | + DEPLOY_SCENARIO={scenario} + INSTALLER_VERSION={stream} + block: true + same-node: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' - trigger-builds: - project: 'fuel-collect-logs-{pod}-daily-{stream}' current-parameters: false @@ -427,63 +334,71 @@ name: 'fuel-os-nosdn-fdio-noha-baremetal-daily-master-trigger' triggers: - timed: '5 20 * * 3,5' +- trigger: + name: 'fuel-k8-calico-nofeature-noha-baremetal-daily-master-trigger' + triggers: + - timed: '' # ---------------------------------------------- -# Triggers for job running on fuel-baremetal against gambia branch +# Triggers for job running on fuel-baremetal against hunter branch # ---------------------------------------------- # HA Scenarios - trigger: - name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-gambia-trigger' + name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-hunter-trigger' triggers: - - timed: '0 20 * * 1,2,4,6,7' + - timed: '0 20 * * 1,2,4,7' - trigger: - name: 'fuel-os-odl-nofeature-ha-baremetal-daily-gambia-trigger' + name: 'fuel-os-odl-nofeature-ha-baremetal-daily-hunter-trigger' triggers: - timed: '0 2 * * *' - trigger: - name: 'fuel-os-ovn-nofeature-ha-baremetal-daily-gambia-trigger' + name: 'fuel-os-ovn-nofeature-ha-baremetal-daily-hunter-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-ovs-ha-baremetal-daily-gambia-trigger' + name: 'fuel-os-nosdn-ovs-ha-baremetal-daily-hunter-trigger' triggers: - timed: '0 5 * * *' - trigger: - name: 'fuel-os-nosdn-fdio-ha-baremetal-daily-gambia-trigger' + name: 'fuel-os-nosdn-fdio-ha-baremetal-daily-hunter-trigger' triggers: - timed: '' # NOHA Scenarios - trigger: - name: 'fuel-os-nosdn-nofeature-noha-baremetal-daily-gambia-trigger' + name: 'fuel-os-nosdn-nofeature-noha-baremetal-daily-hunter-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl-nofeature-noha-baremetal-daily-gambia-trigger' + name: 'fuel-os-odl-nofeature-noha-baremetal-daily-hunter-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl-sfc-noha-baremetal-daily-gambia-trigger' + name: 'fuel-os-odl-sfc-noha-baremetal-daily-hunter-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl-bgpvpn-noha-baremetal-daily-gambia-trigger' + name: 'fuel-os-odl-bgpvpn-noha-baremetal-daily-hunter-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-ovn-nofeature-noha-baremetal-daily-gambia-trigger' + name: 'fuel-os-ovn-nofeature-noha-baremetal-daily-hunter-trigger' triggers: - - timed: '' + - timed: '0 20 * * 6' - trigger: - name: 'fuel-os-odl-ovs-noha-baremetal-daily-gambia-trigger' + name: 'fuel-os-odl-ovs-noha-baremetal-daily-hunter-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-ovs-noha-baremetal-daily-gambia-trigger' + name: 'fuel-os-nosdn-ovs-noha-baremetal-daily-hunter-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-fdio-noha-baremetal-daily-gambia-trigger' + name: 'fuel-os-nosdn-fdio-noha-baremetal-daily-hunter-trigger' triggers: - timed: '0 20 * * 3,5' +- trigger: + name: 'fuel-k8-calico-nofeature-noha-baremetal-daily-hunter-trigger' + triggers: + - timed: '' # ---------------------------------------------- # Triggers for job running on fuel-virtual against master branch # ---------------------------------------------- @@ -540,77 +455,70 @@ name: 'fuel-os-nosdn-fdio-noha-virtual-daily-master-trigger' triggers: - timed: '' -# ---------------------------------------------- -# Triggers for job running on fuel-baremetal against fraser branch (for Dovetail) -# ---------------------------------------------- - trigger: - name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-fraser-trigger' + name: 'fuel-k8-calico-nofeature-noha-virtual-daily-master-trigger' triggers: - - timed: '5 13 * * 6,7' -- trigger: - name: 'fuel-os-odl-nofeature-ha-baremetal-daily-fraser-trigger' - triggers: - - timed: '0 13 * * 6' -- trigger: - name: 'fuel-os-nosdn-ovs-ha-baremetal-daily-fraser-trigger' - triggers: - - timed: '0 13 * * 7' + - timed: '5 16 * * *' # ---------------------------------------------- -# Triggers for job running on fuel-virtual against gambia branch +# Triggers for job running on fuel-virtual against hunter branch # ---------------------------------------------- - trigger: - name: 'fuel-os-nosdn-nofeature-ha-virtual-daily-gambia-trigger' + name: 'fuel-os-nosdn-nofeature-ha-virtual-daily-hunter-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl-nofeature-ha-virtual-daily-gambia-trigger' + name: 'fuel-os-odl-nofeature-ha-virtual-daily-hunter-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-ovn-nofeature-ha-virtual-daily-gambia-trigger' + name: 'fuel-os-ovn-nofeature-ha-virtual-daily-hunter-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-ovs-ha-virtual-daily-gambia-trigger' + name: 'fuel-os-nosdn-ovs-ha-virtual-daily-hunter-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-fdio-ha-virtual-daily-gambia-trigger' + name: 'fuel-os-nosdn-fdio-ha-virtual-daily-hunter-trigger' triggers: - timed: '' # NOHA Scenarios - trigger: - name: 'fuel-os-nosdn-nofeature-noha-virtual-daily-gambia-trigger' + name: 'fuel-os-nosdn-nofeature-noha-virtual-daily-hunter-trigger' triggers: - timed: '0 13 * * *' - trigger: - name: 'fuel-os-odl-nofeature-noha-virtual-daily-gambia-trigger' + name: 'fuel-os-odl-nofeature-noha-virtual-daily-hunter-trigger' triggers: - timed: '0 18 * * *' - trigger: - name: 'fuel-os-odl-sfc-noha-virtual-daily-gambia-trigger' + name: 'fuel-os-odl-sfc-noha-virtual-daily-hunter-trigger' triggers: - timed: '0 4 * * *' - trigger: - name: 'fuel-os-odl-bgpvpn-noha-virtual-daily-gambia-trigger' + name: 'fuel-os-odl-bgpvpn-noha-virtual-daily-hunter-trigger' triggers: - timed: '0 7 * * *' - trigger: - name: 'fuel-os-ovn-nofeature-noha-virtual-daily-gambia-trigger' + name: 'fuel-os-ovn-nofeature-noha-virtual-daily-hunter-trigger' triggers: - timed: '0 23 * * *' - trigger: - name: 'fuel-os-odl-ovs-noha-virtual-daily-gambia-trigger' + name: 'fuel-os-odl-ovs-noha-virtual-daily-hunter-trigger' triggers: - timed: '0 2 * * *' - trigger: - name: 'fuel-os-nosdn-ovs-noha-virtual-daily-gambia-trigger' + name: 'fuel-os-nosdn-ovs-noha-virtual-daily-hunter-trigger' triggers: - timed: '0 9 * * *' - trigger: - name: 'fuel-os-nosdn-fdio-noha-virtual-daily-gambia-trigger' + name: 'fuel-os-nosdn-fdio-noha-virtual-daily-hunter-trigger' triggers: - - timed: '' + - timed: '0 13 * * 6,7' +- trigger: + name: 'fuel-k8-calico-nofeature-noha-virtual-daily-hunter-trigger' + triggers: + - timed: '5 13 * * 6,7' # ---------------------------------------------- # ZTE POD1 Triggers running against master branch # ---------------------------------------------- @@ -667,3 +575,7 @@ name: 'fuel-os-nosdn-fdio-noha-zte-pod1-daily-master-trigger' triggers: - timed: '' +- trigger: + name: 'fuel-k8-calico-nofeature-noha-zte-pod1-daily-master-trigger' + triggers: + - timed: '' diff --git a/jjb/fuel/fuel-docker-jobs.yaml b/jjb/fuel/fuel-docker-jobs.yaml index 869489098..51490380e 100644 --- a/jjb/fuel/fuel-docker-jobs.yaml +++ b/jjb/fuel/fuel-docker-jobs.yaml @@ -12,9 +12,9 @@ - master: branch: '{stream}' disabled: false - - gambia: + - hunter: branch: 'stable/{stream}' - disabled: true + disabled: false arch_tag: - 'amd64': diff --git a/jjb/fuel/fuel-rtd-jobs.yaml b/jjb/fuel/fuel-rtd-jobs.yaml index 7f42c0771..3775be8f2 100644 --- a/jjb/fuel/fuel-rtd-jobs.yaml +++ b/jjb/fuel/fuel-rtd-jobs.yaml @@ -12,9 +12,9 @@ - master: branch: '{stream}' disabled: false - - gambia: + - hunter: branch: 'stable/{stream}' - disabled: true + disabled: false jobs: - '{project-name}-rtd-jobs' diff --git a/jjb/fuel/fuel-verify-jobs.yaml b/jjb/fuel/fuel-verify-jobs.yaml index 4678e4fa1..a5efd2d16 100644 --- a/jjb/fuel/fuel-verify-jobs.yaml +++ b/jjb/fuel/fuel-verify-jobs.yaml @@ -14,10 +14,10 @@ gs-pathname: '' disabled: false functest_docker_tag: hunter - - gambia: + - hunter: branch: 'stable/{stream}' gs-pathname: '/{stream}' - disabled: true + disabled: false functest_docker_tag: '{stream}' ##################################### # cluster architectures @@ -66,7 +66,7 @@ - build-blocker: use-build-blocker: true blocking-jobs: - - 'fuel-os-.*?-daily-.*' + - 'fuel-(os|k8)-.*?-daily-.*' - 'fuel-verify-.*' blocking-level: 'NODE' diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index 8c29249e1..4f3c9ef98 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -10,23 +10,6 @@ TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results ENERGY_RECORDER_API_URL=http://energy.opnfv.fr/resources DOCKER_TAG=${DOCKER_TAG:-$([[ ${BRANCH##*/} == "master" ]] && echo "latest" || echo ${BRANCH##*/})} -check_os_deployment() { - FUNCTEST_IMAGE=${REPO}/functest-healthcheck:${DOCKER_TAG} - echo "Functest: Pulling Functest Docker image ${FUNCTEST_IMAGE} ..." - docker pull ${FUNCTEST_IMAGE}>/dev/null - cmd="docker run --rm ${volumes} ${FUNCTEST_IMAGE} check_deployment" - echo "Checking deployment, CMD: ${cmd}" - eval ${cmd} - ret_value=$? - if [ ${ret_value} != 0 ]; then - echo "ERROR: Problem while checking OpenStack deployment." - exit 1 - else - echo "OpenStack deployment OK." - fi - -} - run_tiers() { tiers=$1 cmd_opt="run_tests -r -t all" @@ -122,7 +105,8 @@ test -f ${HOME}/opnfv/functest/custom/params_${DOCKER_TAG} && custom_params=$(ca envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \ -e NODE_NAME=${NODE_NAME} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} \ -e BUILD_TAG=${BUILD_TAG} -e DEPLOY_TYPE=${DEPLOY_TYPE} -e CI_LOOP=${CI_LOOP} \ - -e TEST_DB_URL=${TEST_DB_URL} -e ENERGY_RECORDER_API_URL=${ENERGY_RECORDER_API_URL}" + -e TEST_DB_URL=${TEST_DB_URL} -e ENERGY_RECORDER_API_URL=${ENERGY_RECORDER_API_URL} \ + -e DEBUG=true" ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" @@ -173,12 +157,15 @@ apex) compute-feature-enabled: shelve: false vnc_console: true + block_migration_for_live_migration: false identity-feature-enabled: api_v2: false api_v2_admin: false image-feature-enabled: api_v2: true api_v1: false +object-storage: + operator_role: SwiftOperator volume: storage_protocol: ceph volume-feature-enabled: @@ -191,6 +178,7 @@ compass) compute-feature-enabled: shelve: false vnc_console: false + block_migration_for_live_migration: false spice_console: true identity-feature-enabled: api_v2: false @@ -242,12 +230,62 @@ volume-feature-enabled: EOF ;; esac +case ${BRANCH} in +master) + cat << EOF >> "${tempest_conf_yaml}" +compute: + max_microversion: latest +EOF + ;; +stable/hunter) + cat << EOF >> "${tempest_conf_yaml}" +compute: + max_microversion: 2.65 +EOF + ;; +stable/gambia) + cat << EOF >> "${tempest_conf_yaml}" +compute: + max_microversion: 2.60 +EOF + ;; +esac echo "tempest_conf.yaml:" && cat "${tempest_conf_yaml}" volumes="${images_vol} ${results_vol} ${sshkey_vol} ${libvirt_vol} \ ${userconfig_vol} ${rc_file_vol} ${cacert_file_vol} \ -v ${tempest_conf_yaml}:/usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml" +if [[ ${INSTALLER_TYPE} == 'apex' ]]; then + blacklist_yaml=$(mktemp) + cat << EOF >> "${blacklist_yaml}" +--- +- + scenarios: + - os-ovn-nofeature-ha + tests: + - neutron_tempest_plugin.api.admin.test_agent_management + - neutron_tempest_plugin.api.admin.test_dhcp_agent_scheduler + - patrole_tempest_plugin.tests.api.network.test_agents_rbac + - patrole_tempest_plugin.tests.api.network.test_networks_rbac.NetworksRbacTest.test_create_network_provider_network_type + - patrole_tempest_plugin.tests.api.network.test_networks_rbac.NetworksRbacTest.test_create_network_provider_segmentation_id + - tempest.api.network.admin.test_agent_management + - tempest.api.network.admin.test_dhcp_agent_scheduler + - tempest.api.object_storage.test_crossdomain.CrossdomainTest.test_get_crossdomain_policy +- + scenarios: + - os-nosdn-nofeature-ha + tests: + - tempest.api.object_storage.test_crossdomain.CrossdomainTest.test_get_crossdomain_policy +- + scenarios: + - os-nosdn-nofeature-noha + tests: + - tempest.api.object_storage.test_crossdomain.CrossdomainTest.test_get_crossdomain_policy +EOF + volumes="${volumes} -v ${blacklist_yaml}:/usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.yaml" +fi + ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value" echo 0 > ${ret_val_file} @@ -263,21 +301,15 @@ elif [ ${FUNCTEST_MODE} == 'tier' ]; then else tests=() skip_tests=0 - if [ ${DEPLOY_TYPE} == 'baremetal' ] && [ "${HOST_ARCH}" != "aarch64" ]; then - if [[ ${BRANCH} == "stable/fraser" ]]; then - tiers=(healthcheck smoke features vnf parser) - tests=(tempest_full_parallel) - elif [[ ${BRANCH} == "stable/gambia" ]]; then + if [ "${HOST_ARCH}" != "aarch64" ]; then + if [[ ${BRANCH} == "stable/gambia" ]]; then tiers=(healthcheck smoke benchmarking features vnf components) else tiers=(healthcheck smoke benchmarking features vnf) fi else - if [[ ${BRANCH} == "stable/fraser" ]]; then - tiers=(healthcheck smoke features parser) - tests=(tempest_full_parallel) - elif [[ ${BRANCH} == "stable/gambia" ]]; then - tiers=(healthcheck smoke benchmarking features vnf components) + if [[ ${BRANCH} == "stable/gambia" ]]; then + tiers=(healthcheck smoke benchmarking features components) else tiers=(healthcheck smoke benchmarking features) fi diff --git a/jjb/functest/functest-daily-jobs.yaml b/jjb/functest/functest-daily-jobs.yaml index 34aee8a9d..1a94d5140 100644 --- a/jjb/functest/functest-daily-jobs.yaml +++ b/jjb/functest/functest-daily-jobs.yaml @@ -14,10 +14,6 @@ stream: master branch: '{stream}' gs-pathname: '' - fraser: &fraser - stream: fraser - branch: 'stable/{stream}' - gs-pathname: '/{stream}' gambia: &gambia stream: gambia branch: 'stable/{stream}' @@ -47,73 +43,20 @@ - baremetal: slave-label: fuel-baremetal installer: fuel - <<: *gambia - - virtual: - slave-label: fuel-virtual - installer: fuel - <<: *gambia - - baremetal: - slave-label: fuel-baremetal - installer: fuel - <<: *fraser + <<: *hunter - virtual: slave-label: fuel-virtual installer: fuel - <<: *fraser - # joid CI PODs - - baremetal: - slave-label: joid-baremetal - installer: joid - <<: *master - - virtual: - slave-label: joid-virtual - installer: joid - <<: *master - - baremetal: - slave-label: joid-baremetal - installer: joid - <<: *fraser - - virtual: - slave-label: joid-virtual - installer: joid - <<: *fraser + <<: *hunter # compass CI PODs - baremetal: slave-label: compass-baremetal installer: compass - <<: *master - - virtual: - slave-label: compass-virtual - installer: compass - <<: *master - - arm-virtual: - slave-label: compass-arm-virtual - installer: compass - <<: *master - - baremetal: - slave-label: compass-baremetal - installer: compass - <<: *fraser - - virtual: - slave-label: compass-virtual - installer: compass - <<: *fraser - - arm-virtual: - slave-label: compass-arm-virtual - installer: compass - <<: *fraser - - baremetal: - slave-label: compass-baremetal - installer: compass <<: *gambia - virtual: slave-label: compass-virtual installer: compass <<: *gambia - - arm-virtual: - slave-label: compass-arm-virtual - installer: compass - <<: *gambia # apex CI PODs - virtual: slave-label: apex-virtual-master @@ -131,123 +74,15 @@ slave-label: apex-baremetal-master installer: apex <<: *gambia - - virtual: - slave-label: apex-virtual-fraser - installer: apex - <<: *fraser - - baremetal: - slave-label: apex-baremetal-fraser - installer: apex - <<: *fraser # armband CI PODs - armband-baremetal: slave-label: armband-baremetal installer: fuel <<: *master - - armband-virtual: - slave-label: armband-virtual - installer: fuel - <<: *master - - armband-baremetal: - slave-label: armband-baremetal - installer: fuel - <<: *gambia - - armband-virtual: - slave-label: armband-virtual - installer: fuel - <<: *gambia - armband-baremetal: slave-label: armband-baremetal installer: fuel - <<: *fraser - - armband-virtual: - slave-label: armband-virtual - installer: fuel - <<: *fraser - # daisy CI PODs - - baremetal: - slave-label: daisy-baremetal - installer: daisy - <<: *master - - virtual: - slave-label: daisy-virtual - installer: daisy - <<: *master - - baremetal: - slave-label: daisy-baremetal - installer: daisy - <<: *fraser - - virtual: - slave-label: daisy-virtual - installer: daisy - <<: *fraser - # netvirt 3rd party ci - - virtual: - slave-label: odl-netvirt-virtual - installer: netvirt - <<: *master - # ------------------------------- - # None-CI PODs - # ------------------------------- - - orange-pod1: - slave-label: '{pod}' - installer: joid - <<: *master - - orange-pod5: - slave-label: '{pod}' - installer: fuel - <<: *master - - orange-pod2: - slave-label: '{pod}' - installer: joid - <<: *master - - baremetal-centos: - slave-label: 'intel-pod8' - installer: compass - <<: *master - - nokia-pod1: - slave-label: '{pod}' - installer: apex - <<: *master - - zte-pod1: - slave-label: '{pod}' - installer: fuel - <<: *master - - zte-pod1: - slave-label: '{pod}' - installer: fuel - <<: *fraser - - zte-pod2: - slave-label: '{pod}' - installer: daisy - <<: *master - - zte-pod2: - slave-label: '{pod}' - installer: daisy - <<: *fraser - - zte-pod3: - slave-label: '{pod}' - installer: daisy - <<: *master - - zte-pod3: - slave-label: '{pod}' - installer: daisy - <<: *fraser - - zte-pod9: - slave-label: '{pod}' - installer: daisy - <<: *master - - zte-pod9: - slave-label: '{pod}' - installer: daisy - <<: *fraser - # ------------------------------- - # PODs for verify jobs triggered by each patch upload - # - ool-virtual1: - # slave-label: '{pod}' - # installer: apex - # <<: *master - # ------------------------------- + <<: *hunter testsuite: - 'suite': diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml index 71215cae1..328ef7c6c 100644 --- a/jjb/functest/functest-docker.yaml +++ b/jjb/functest/functest-docker.yaml @@ -12,13 +12,13 @@ - master: branch: '{stream}' disabled: false - - hunter: + - iruya: branch: 'stable/{stream}' disabled: false - - gambia: + - hunter: branch: 'stable/{stream}' disabled: false - - fraser: + - gambia: branch: 'stable/{stream}' disabled: false @@ -35,7 +35,6 @@ - 'healthcheck' - 'features' - 'components' - - 'parser' - 'smoke' - 'benchmarking' - 'vnf' @@ -43,18 +42,10 @@ exclude: - stream: 'master' image: 'components' - - stream: 'hunter' + - stream: 'iruya' image: 'components' - - stream: 'master' - image: 'parser' - stream: 'hunter' - image: 'parser' - - stream: 'gambia' - image: 'parser' - - stream: 'fraser' - image: 'tempest' - - stream: 'fraser' - image: 'benchmarking' + image: 'components' # settings for jobs run in multijob phases build-job-settings: &build-job-settings @@ -161,10 +152,6 @@ <<: *build-job-settings - name: 'functest-components-docker-build-arm64-{stream}' <<: *build-job-settings - - name: 'functest-parser-docker-build-amd64-{stream}' - <<: *build-job-settings - - name: 'functest-parser-docker-build-arm64-{stream}' - <<: *build-job-settings - name: 'functest-smoke-docker-build-amd64-{stream}' <<: *build-job-settings - name: 'functest-smoke-docker-build-arm64-{stream}' @@ -188,8 +175,6 @@ <<: *manifest-job-settings - name: 'functest-components-docker-manifest-{stream}' <<: *manifest-job-settings - - name: 'functest-parser-docker-manifest-{stream}' - <<: *manifest-job-settings - name: 'functest-smoke-docker-manifest-{stream}' <<: *manifest-job-settings - name: 'functest-benchmarking-docker-manifest-{stream}' @@ -217,9 +202,9 @@ #!/bin/bash -ex case "{arch_tag}" in "arm64") - sudo amd64_dirs= arm64_dirs=docker/{image} bash ./build.sh ;; + sudo amd64_dirs= arm64_dirs=docker/{image} arm_dirs= bash ./build.sh ;; *) - sudo amd64_dirs=docker/{image} arm64_dirs= bash ./build.sh ;; + sudo amd64_dirs=docker/{image} arm64_dirs= arm_dirs= bash ./build.sh ;; esac exit $? diff --git a/jjb/functest/functest-k8.sh b/jjb/functest/functest-k8.sh index 419c4e051..4543f7f01 100755 --- a/jjb/functest/functest-k8.sh +++ b/jjb/functest/functest-k8.sh @@ -4,41 +4,24 @@ set -e set +u set +o pipefail -[[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null" +redirect="/dev/stdout" FUNCTEST_DIR=/home/opnfv/functest -rc_file=${HOME}/k8.creds -sudo rm -rf $rc_file - -if [[ ${INSTALLER_TYPE} == 'compass' ]]; then - admin_conf_file_vol="-v ${HOME}/admin.conf:/root/.kube/config" - echo "export KUBERNETES_PROVIDER=local" >> $rc_file - KUBE_MASTER_URL=$(cat ${HOME}/admin.conf|grep server| awk '{print $2}') - echo "export KUBE_MASTER_URL=$KUBE_MASTER_URL" >> $rc_file - KUBE_MASTER_IP=$(echo $KUBE_MASTER_URL|awk -F'https://|:[0-9]+' '$0=$2') - echo "export KUBE_MASTER_IP=$KUBE_MASTER_IP" >> $rc_file -elif [[ ${INSTALLER_TYPE} == 'joid' && ${BRANCH} == 'master' ]]; then - admin_conf_file_vol="-v ${HOME}/joid_config/config:/root/.kube/config" - rc_file=${HOME}/joid_config/k8config -else - echo "Not supported by other installers yet" - exit 1 -fi - -rc_file_vol="-v ${rc_file}:${FUNCTEST_DIR}/conf/env_file" +admin_conf_file_vol="-v ${HOME}/admin.conf:/root/.kube/config" +cat ${HOME}/admin.conf dir_result="${HOME}/opnfv/functest/results/${BRANCH##*/}" mkdir -p ${dir_result} sudo rm -rf ${dir_result}/* results_vol="-v ${dir_result}:${FUNCTEST_DIR}/results" -volumes="${rc_file_vol} ${results_vol} ${admin_conf_file_vol}" +volumes="${results_vol} ${admin_conf_file_vol}" envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} \ -e NODE_NAME=${NODE_NAME} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} \ - -e BUILD_TAG=${BUILD_TAG} -e DEPLOY_TYPE=${DEPLOY_TYPE}" + -e BUILD_TAG=${BUILD_TAG}" -DOCKER_TAG=`[[ ${BRANCH##*/} == "master" ]] && echo "latest" || echo ${BRANCH##*/}` +DOCKER_TAG=${DOCKER_TAG:-$([[ ${BRANCH##*/} == "master" ]] && echo "latest" || echo ${BRANCH##*/})} set +e diff --git a/jjb/functest/functest-kubernetes-docker.yaml b/jjb/functest/functest-kubernetes-docker.yaml index c328f5d86..c70aae35b 100644 --- a/jjb/functest/functest-kubernetes-docker.yaml +++ b/jjb/functest/functest-kubernetes-docker.yaml @@ -12,13 +12,13 @@ - master: branch: '{stream}' disabled: false - - hunter: + - iruya: branch: 'stable/{stream}' disabled: false - - gambia: + - hunter: branch: 'stable/{stream}' disabled: false - - fraser: + - gambia: branch: 'stable/{stream}' disabled: false diff --git a/jjb/functest/functest-kubernetes-project-jobs.yaml b/jjb/functest/functest-kubernetes-project-jobs.yaml index 46b77ce68..161469bce 100644 --- a/jjb/functest/functest-kubernetes-project-jobs.yaml +++ b/jjb/functest/functest-kubernetes-project-jobs.yaml @@ -11,22 +11,21 @@ jobs: - 'functest-kubernetes-verify-{stream}' - 'functest-kubernetes-verify-{phase}-{stream}' - - 'functest-kubernetes-docs-upload-{stream}' stream: - master: branch: '{stream}' gs-pathname: '' disabled: false - - hunter: &hunter + - iruya: &iruya branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false - - gambia: &gambia + - hunter: &hunter branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false - - fraser: &fraser + - gambia: &gambia branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false @@ -34,10 +33,6 @@ phase: - 'unit-tests-and-docs': slave-label: 'opnfv-build-ubuntu' - - 'build-x86_64': - slave-label: 'opnfv-build-ubuntu' - - 'build-aarch64': - slave-label: 'opnfv-build-ubuntu-arm' - job-template: name: 'functest-kubernetes-verify-{stream}' @@ -81,30 +76,6 @@ node-parameters: false kill-phase-on: FAILURE abort-all-job: false - - name: 'functest-kubernetes-verify-build-x86_64-{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 - ARCH=x86_64 - git-revision: true - node-parameters: false - kill-phase-on: FAILURE - abort-all-job: false - - name: 'functest-kubernetes-verify-build-aarch64-{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 - ARCH=aarch64 - git-revision: true - node-parameters: false - kill-phase-on: FAILURE - abort-all-job: false - job-template: name: 'functest-kubernetes-verify-{phase}-{stream}' @@ -131,28 +102,6 @@ publishers: - 'functest-kubernetes-verify-{phase}-publishers-macro' -- job-template: - name: 'functest-kubernetes-docs-upload-{stream}' - - disabled: '{obj:disabled}' - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - 'opnfv-build-ubuntu-defaults' - - scm: - - git-scm - - triggers: - - 'functest-kubernetes-docs-upload-triggers-macro': - project: '{project}' - branch: '{branch}' - - builders: - - functest-kubernetes-upload-doc-artifact - ################################ # job triggers ################################ @@ -182,25 +131,6 @@ - compare-type: ANT pattern: 'docs/**|.gitignore' -- trigger: - name: 'functest-kubernetes-docs-upload-triggers-macro' - triggers: - - gerrit: - server-name: 'gerrit.opnfv.org' - trigger-on: - - change-merged-event - - comment-added-contains-event: - comment-contains-value: 'remerge' - projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - disable-strict-forbidden-file-verification: 'true' - forbidden-file-paths: - - compare-type: ANT - pattern: 'docs/**|.gitignore' ################################ # job builders ################################ @@ -211,24 +141,6 @@ - shell: | cd $WORKSPACE && tox -- builder: - name: 'functest-kubernetes-verify-build-x86_64-builders-macro' - builders: - - shell: | - echo "Not activated!" - -- builder: - name: 'functest-kubernetes-verify-build-aarch64-builders-macro' - builders: - - shell: | - echo "Not activated!" - -- builder: - name: 'functest-kubernetes-upload-doc-artifact' - builders: - - shell: | - cd $WORKSPACE && tox -edocs - wget -O - https://git.opnfv.org/releng/plain/utils/upload-artifact.sh | bash -s "api/_build" "docs" ################################ # job publishers ################################ @@ -253,13 +165,3 @@ unhealthy: 40 failing: 30 - email-jenkins-admins-on-failure - -- publisher: - name: 'functest-kubernetes-verify-build-x86_64-publishers-macro' - publishers: - - email-jenkins-admins-on-failure - -- publisher: - name: 'functest-kubernetes-verify-build-aarch64-publishers-macro' - publishers: - - email-jenkins-admins-on-failure diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml index 338363cde..628b06ee3 100644 --- a/jjb/functest/functest-kubernetes.yaml +++ b/jjb/functest/functest-kubernetes.yaml @@ -8,12 +8,10 @@ repo: 'opnfv' port: tag: - - latest: - branch: master + - iruya: + branch: stable/iruya - hunter: branch: stable/hunter - - gambia: - branch: stable/gambia - parameter: name: functest-kubernetes-slave @@ -238,7 +236,7 @@ use-build-blocker: true blocking-level: 'NODE' blocking-jobs: - - '^functest-kubernetes-[a-z]+-(daily|check|gate)$' + - '^(functest|functest-kubernetes)-[a-z]+-(daily|check|gate)$' builders: - multijob: name: remove former images @@ -303,20 +301,20 @@ ref: $branch - project: - name: 'functest-kubernetes-_-golang-alpine3.8-rmi' + name: 'functest-kubernetes-_-golang-alpine3.9-rmi' repo: _ port: container: golang - tag: alpine3.8 + tag: alpine3.9 jobs: - 'functest-kubernetes-{repo}-{container}-{tag}-rmi' - project: - name: 'functest-kubernetes-_-golang-alpine3.8-pull' + name: 'functest-kubernetes-_-golang-alpine3.9-pull' repo: _ port: container: golang - tag: alpine3.8 + tag: alpine3.9 jobs: - 'functest-kubernetes-{repo}-{container}-{tag}-pull' @@ -372,7 +370,7 @@ use-build-blocker: true blocking-level: 'NODE' blocking-jobs: - - '^functest-kubernetes-[a-z]+-(daily|check|gate)$' + - '^(functest|functest-kubernetes)-[a-z]+-(daily|check|gate)$' builders: - multijob: name: remove former images @@ -386,12 +384,12 @@ - multijob: name: remove dependencies projects: - - name: 'functest-kubernetes-_-golang-alpine3.8-rmi' + - name: 'functest-kubernetes-_-golang-alpine3.9-rmi' <<: *functest-kubernetes-jobs - multijob: name: pull dependencies projects: - - name: 'functest-kubernetes-_-golang-alpine3.8-pull' + - name: 'functest-kubernetes-_-golang-alpine3.9-pull' <<: *functest-kubernetes-jobs - multijob: name: build opnfv/functest-kubernetes-core @@ -464,7 +462,7 @@ use-build-blocker: true blocking-level: 'NODE' blocking-jobs: - - '^functest-kubernetes-[a-z]+-(daily|check|gate)$' + - '^(functest|functest-kubernetes)-[a-z]+-(daily|check|gate)$' builders: - multijob: name: remove former images @@ -478,12 +476,12 @@ - multijob: name: remove dependencies projects: - - name: 'functest-kubernetes-_-golang-alpine3.8-rmi' + - name: 'functest-kubernetes-_-golang-alpine3.9-rmi' <<: *functest-kubernetes-jobs - multijob: name: pull dependencies projects: - - name: 'functest-kubernetes-_-golang-alpine3.8-pull' + - name: 'functest-kubernetes-_-golang-alpine3.9-pull' <<: *functest-kubernetes-jobs - multijob: name: build opnfv/functest-kubernetes-core diff --git a/jjb/functest/functest-project-jobs.yaml b/jjb/functest/functest-project-jobs.yaml index e9a65b495..405202ecd 100644 --- a/jjb/functest/functest-project-jobs.yaml +++ b/jjb/functest/functest-project-jobs.yaml @@ -11,33 +11,28 @@ jobs: - 'functest-verify-{stream}' - 'functest-verify-{phase}-{stream}' - - 'functest-docs-upload-{stream}' stream: - master: branch: '{stream}' gs-pathname: '' disabled: false - - hunter: + - iruya: branch: 'stable/{stream}' gs-pathname: '' disabled: false - - gambia: + - hunter: branch: 'stable/{stream}' gs-pathname: '' disabled: false - - fraser: &fraser + - gambia: branch: 'stable/{stream}' - gs-pathname: '/{stream}' + gs-pathname: '' disabled: false phase: - 'unit-tests-and-docs': slave-label: 'opnfv-build-ubuntu' - - 'build-x86_64': - slave-label: 'opnfv-build-ubuntu' - - 'build-aarch64': - slave-label: 'opnfv-build-ubuntu-arm' - job-template: name: 'functest-verify-{stream}' @@ -81,30 +76,6 @@ node-parameters: false kill-phase-on: FAILURE abort-all-job: false - - name: 'functest-verify-build-x86_64-{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 - ARCH=x86_64 - git-revision: true - node-parameters: false - kill-phase-on: FAILURE - abort-all-job: false - - name: 'functest-verify-build-aarch64-{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 - ARCH=aarch64 - git-revision: true - node-parameters: false - kill-phase-on: FAILURE - abort-all-job: false - job-template: name: 'functest-verify-{phase}-{stream}' @@ -131,28 +102,6 @@ publishers: - 'functest-verify-{phase}-publishers-macro' -- job-template: - name: 'functest-docs-upload-{stream}' - - disabled: '{obj:disabled}' - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - 'opnfv-build-ubuntu-defaults' - - scm: - - git-scm - - triggers: - - 'functest-docs-upload-triggers-macro': - project: '{project}' - branch: '{branch}' - - builders: - - functest-upload-doc-artifact - ################################ # job triggers ################################ @@ -182,25 +131,6 @@ - compare-type: ANT pattern: 'docs/**|.gitignore' -- trigger: - name: 'functest-docs-upload-triggers-macro' - triggers: - - gerrit: - server-name: 'gerrit.opnfv.org' - trigger-on: - - change-merged-event - - comment-added-contains-event: - comment-contains-value: 'remerge' - projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - disable-strict-forbidden-file-verification: 'true' - forbidden-file-paths: - - compare-type: ANT - pattern: 'docs/**|.gitignore' ################################ # job builders ################################ @@ -211,24 +141,6 @@ - shell: | cd $WORKSPACE && tox -- builder: - name: 'functest-verify-build-x86_64-builders-macro' - builders: - - shell: | - echo "Not activated!" - -- builder: - name: 'functest-verify-build-aarch64-builders-macro' - builders: - - shell: | - echo "Not activated!" - -- builder: - name: 'functest-upload-doc-artifact' - builders: - - shell: | - cd $WORKSPACE && tox -edocs - wget -O - https://git.opnfv.org/releng/plain/utils/upload-artifact.sh | bash -s "api/build" "docs" ################################ # job publishers ################################ @@ -253,13 +165,3 @@ unhealthy: 40 failing: 30 - email-jenkins-admins-on-failure - -- publisher: - name: 'functest-verify-build-x86_64-publishers-macro' - publishers: - - email-jenkins-admins-on-failure - -- publisher: - name: 'functest-verify-build-aarch64-publishers-macro' - publishers: - - email-jenkins-admins-on-failure diff --git a/jjb/functest/functest-weekly-jobs.yaml b/jjb/functest/functest-weekly-jobs.yaml deleted file mode 100644 index c88fa0050..000000000 --- a/jjb/functest/functest-weekly-jobs.yaml +++ /dev/null @@ -1,128 +0,0 @@ ---- -################################### -# job configuration for functest -################################### -- project: - name: functest-weekly - - project: functest - - # ------------------------------- - # BRANCH ANCHORS - # ------------------------------- - master: &master - stream: master - branch: '{stream}' - gs-pathname: '' - docker-tag: 'latest' - disabled: false - fraser: &fraser - stream: fraser - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - docker-tag: '{stream}' - disabled: false - # ------------------------------- - # POD, INSTALLER, AND BRANCH MAPPING - # ------------------------------- - # Installers using labels - # CI PODs - # This section should only contain the installers - # that have been switched using labels for slaves - # ------------------------------- - pod: - # fuel CI PODs - - baremetal: - slave-label: fuel-baremetal - installer: fuel - <<: *master - - virtual: - slave-label: fuel-virtual - installer: fuel - <<: *master - - baremetal: - slave-label: fuel-baremetal - installer: fuel - <<: *fraser - - virtual: - slave-label: fuel-virtual - installer: fuel - <<: *fraser - # ------------------------------- - jobs: - - 'functest-{installer}-{pod}-weekly-{stream}' - -################################ -# job template -################################ -- job-template: - name: 'functest-{installer}-{pod}-weekly-{stream}' - - disabled: '{obj:disabled}' - - concurrent: true - - properties: - - logrotate-default - - throttle: - enabled: true - max-per-node: 1 - option: 'project' - - wrappers: - - build-name: - name: '$BUILD_NUMBER Suite: $FUNCTEST_SUITE_NAME Scenario: $DEPLOY_SCENARIO' - - timeout: - timeout: '400' - abort: true - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - '{installer}-defaults' - - '{slave-label}-defaults' - - string: - name: FUNCTEST_SUITE_NAME - default: 'weekly' - description: "Weekly suite name to run" - - string: - name: DEPLOY_SCENARIO - default: 'os-odl_l2-nofeature-ha' - - string: - name: DOCKER_TAG - default: '{docker-tag}' - description: 'Tag to pull docker image' - - string: - name: CLEAN_DOCKER_IMAGES - default: 'false' - description: 'Remove downloaded docker images (opnfv/functest*:*)' - - functest-parameter: - gs-pathname: '{gs-pathname}' - - scm: - - git-scm - - builders: - - description-setter: - description: "Built on $NODE_NAME" - - 'functest-weekly-builder' -######################## -# builder macros -######################## -- builder: - name: functest-weekly-builder - builders: - - shell: - !include-raw: ./functest-cleanup.sh - # yamllint disable rule:indentation - - shell: - !include-raw: - - ./functest-env-presetup.sh - - ../../utils/fetch_os_creds.sh - - ./functest-alpine.sh - # yamllint enable rule:indentation - - shell: - !include-raw: ../../utils/push-test-logs.sh - - shell: - !include-raw: ./functest-exit.sh diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml index 129391545..074ad737b 100644 --- a/jjb/functest/functest.yaml +++ b/jjb/functest/functest.yaml @@ -10,15 +10,20 @@ tag: - latest: branch: master + slave: lf-virtual9 + - iruya: + branch: stable/iruya + slave: lf-virtual4 - hunter: branch: stable/hunter + slave: lf-virtual6 - parameter: name: functest-slave parameters: - label: name: slave - default: functest-virtual + default: '{slave}' - parameter: name: functest-branch @@ -96,9 +101,13 @@ fi sudo docker run --rm \ -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \ + -e DEBUG=True \ -e EXTERNAL_NETWORK=public \ + -e DEBUG=true \ -v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \ -v /home/opnfv/functest/images:/home/opnfv/functest/images \ + -v /home/opnfv/functest/blacklist.yaml:/usr/lib/python2.7/\ + site-packages/functest/opnfv_tests/openstack/rally/blacklist.yaml \ $image run_tests -t {test} res=$? gsutil -m cp -r $WORKSPACE/ \ @@ -134,7 +143,8 @@ - job-template: name: 'functest-{repo}-{container}-{tag}-pull' parameters: - - functest-slave + - functest-slave: + slave: '{slave}' builders: - functest-pull-containers: <<: *functest-containers @@ -177,7 +187,8 @@ - job-template: name: 'functest-{repo}-{container}-{tag}-rmi' parameters: - - functest-slave + - functest-slave: + slave: '{slave}' builders: - functest-remove-images: <<: *functest-containers @@ -220,7 +231,8 @@ - job-template: name: 'functest-{repo}-{container}-{tag}-{test}-run' parameters: - - functest-slave + - functest-slave: + slave: '{slave}' builders: - functest-run-containers: <<: *functest-run-containers @@ -241,8 +253,6 @@ - vping_userdata - cinder_test - odl - - api_check - - snaps_health_check - tempest_smoke jobs: - 'functest-{repo}-{container}-{tag}-{test}-run' @@ -258,7 +268,6 @@ - tempest_full - tempest_scenario - patrole - - snaps_smoke - neutron_trunk - networking-bgpvpn - networking-sfc @@ -310,13 +319,14 @@ triggers: - timed: '@daily' parameters: - - functest-slave + - functest-slave: + slave: '{slave}' properties: - build-blocker: use-build-blocker: true blocking-level: 'NODE' blocking-jobs: - - '^functest-[a-z]+-(daily|check|gate)$' + - '^functest-{tag}-(daily|check|gate)$' builders: - multijob: name: remove former images @@ -369,10 +379,6 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-healthcheck-{tag}-odl-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-healthcheck-{tag}-api_check-run' - <<: *functest-jobs - - name: 'functest-opnfv-functest-healthcheck-{tag}-snaps_health_check-run' - <<: *functest-jobs - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run' <<: *functest-jobs - multijob: @@ -390,8 +396,6 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-{tag}-snaps_smoke-run' - <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-neutron_trunk-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-networking-bgpvpn-run' @@ -442,7 +446,8 @@ - job-template: name: 'functest-{repo}-{container}-{tag}-gate' parameters: - - functest-slave + - functest-slave: + slave: '{slave}' scm: - functest-scm: ref: $GERRIT_REFSPEC @@ -454,7 +459,8 @@ - job-template: name: 'functest-{repo}-{container}-{tag}-check' parameters: - - functest-slave + - functest-slave: + slave: '{slave}' - functest-branch: branch: '{branch}' scm: @@ -466,20 +472,22 @@ ref: $branch - project: - name: 'functest-_-alpine-3.8-rmi' + name: 'functest-_-alpine-3.9-rmi' repo: _ port: container: alpine - tag: 3.8 + tag: 3.9 + slave: master jobs: - 'functest-{repo}-{container}-{tag}-rmi' - project: - name: 'functest-_-alpine-3.8-pull' + name: 'functest-_-alpine-3.9-pull' repo: _ port: container: alpine - tag: 3.8 + tag: 3.9 + slave: master jobs: - 'functest-{repo}-{container}-{tag}-pull' @@ -557,7 +565,8 @@ name: 'functest-{tag}-check' project-type: multijob parameters: - - functest-slave + - functest-slave: + slave: '{slave}' - functest-branch: branch: '{branch}' properties: @@ -565,7 +574,7 @@ use-build-blocker: true blocking-level: 'NODE' blocking-jobs: - - '^functest-[a-z]+-(daily|check|gate)$' + - '^functest-{tag}-(daily|check|gate)$' builders: - multijob: name: remove former images @@ -583,12 +592,12 @@ - multijob: name: remove dependencies projects: - - name: 'functest-_-alpine-3.8-rmi' + - name: 'functest-_-alpine-3.9-rmi' <<: *functest-jobs - multijob: name: pull dependencies projects: - - name: 'functest-_-alpine-3.8-pull' + - name: 'functest-_-alpine-3.9-pull' <<: *functest-jobs - multijob: name: build opnfv/functest-core @@ -638,10 +647,6 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-healthcheck-{tag}-odl-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-healthcheck-{tag}-api_check-run' - <<: *functest-jobs - - name: 'functest-opnfv-functest-healthcheck-{tag}-snaps_health_check-run' - <<: *functest-jobs - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run' <<: *functest-jobs - multijob: @@ -659,8 +664,6 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-{tag}-snaps_smoke-run' - <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-neutron_trunk-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-networking-bgpvpn-run' @@ -738,13 +741,14 @@ - functest-patchset-created: branch: '{branch}' parameters: - - functest-slave + - functest-slave: + slave: '{slave}' properties: - build-blocker: use-build-blocker: true blocking-level: 'NODE' blocking-jobs: - - '^functest-[a-z]+-(daily|check|gate)$' + - '^functest-{tag}-(daily|check|gate)$' builders: - multijob: name: remove former images @@ -762,12 +766,12 @@ - multijob: name: remove dependencies projects: - - name: 'functest-_-alpine-3.8-rmi' + - name: 'functest-_-alpine-3.9-rmi' <<: *functest-jobs - multijob: name: pull dependencies projects: - - name: 'functest-_-alpine-3.8-pull' + - name: 'functest-_-alpine-3.9-pull' <<: *functest-jobs - multijob: name: build opnfv/functest-core @@ -817,10 +821,6 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-healthcheck-{tag}-odl-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-healthcheck-{tag}-api_check-run' - <<: *functest-jobs - - name: 'functest-opnfv-functest-healthcheck-{tag}-snaps_health_check-run' - <<: *functest-jobs - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run' <<: *functest-jobs - multijob: @@ -838,8 +838,6 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-{tag}-snaps_smoke-run' - <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-neutron_trunk-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-networking-bgpvpn-run' diff --git a/jjb/functest/xtesting-docker.yaml b/jjb/functest/xtesting-docker.yaml index 88416bbf9..4847bbd9c 100644 --- a/jjb/functest/xtesting-docker.yaml +++ b/jjb/functest/xtesting-docker.yaml @@ -12,13 +12,13 @@ - master: branch: '{stream}' disabled: false - - hunter: + - iruya: branch: 'stable/{stream}' disabled: false - - gambia: + - hunter: branch: 'stable/{stream}' disabled: false - - fraser: + - gambia: branch: 'stable/{stream}' disabled: false diff --git a/jjb/functest/xtesting-project-jobs.yaml b/jjb/functest/xtesting-project-jobs.yaml index 239ae9f9b..830740151 100644 --- a/jjb/functest/xtesting-project-jobs.yaml +++ b/jjb/functest/xtesting-project-jobs.yaml @@ -11,22 +11,21 @@ jobs: - 'xtesting-verify-{stream}' - 'xtesting-verify-{phase}-{stream}' - - 'xtesting-docs-upload-{stream}' stream: - master: branch: '{stream}' gs-pathname: '' disabled: false - - hunter: &hunter + - iruya: &iruya branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false - - gambia: &gambia + - hunter: &hunter branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false - - fraser: &fraser + - gambia: &gambia branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false @@ -34,10 +33,6 @@ phase: - 'unit-tests-and-docs': slave-label: 'opnfv-build-ubuntu' - - 'build-x86_64': - slave-label: 'opnfv-build-ubuntu' - - 'build-aarch64': - slave-label: 'opnfv-build-ubuntu-arm' - job-template: name: 'xtesting-verify-{stream}' @@ -81,30 +76,6 @@ node-parameters: false kill-phase-on: FAILURE abort-all-job: false - - name: 'xtesting-verify-build-x86_64-{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 - ARCH=x86_64 - git-revision: true - node-parameters: false - kill-phase-on: FAILURE - abort-all-job: false - - name: 'xtesting-verify-build-aarch64-{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 - ARCH=aarch64 - git-revision: true - node-parameters: false - kill-phase-on: FAILURE - abort-all-job: false - job-template: name: 'xtesting-verify-{phase}-{stream}' @@ -131,28 +102,6 @@ publishers: - 'xtesting-verify-{phase}-publishers-macro' -- job-template: - name: 'xtesting-docs-upload-{stream}' - - disabled: '{obj:disabled}' - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - 'opnfv-build-ubuntu-defaults' - - scm: - - git-scm - - triggers: - - 'xtesting-docs-upload-triggers-macro': - project: '{project}' - branch: '{branch}' - - builders: - - xtesting-upload-doc-artifact - ################################ # job triggers ################################ @@ -182,25 +131,6 @@ - compare-type: ANT pattern: 'docs/**|.gitignore' -- trigger: - name: 'xtesting-docs-upload-triggers-macro' - triggers: - - gerrit: - server-name: 'gerrit.opnfv.org' - trigger-on: - - change-merged-event - - comment-added-contains-event: - comment-contains-value: 'remerge' - projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - disable-strict-forbidden-file-verification: 'true' - forbidden-file-paths: - - compare-type: ANT - pattern: 'docs/**|.gitignore' ################################ # job builders ################################ @@ -211,24 +141,6 @@ - shell: | cd $WORKSPACE && tox -- builder: - name: 'xtesting-verify-build-x86_64-builders-macro' - builders: - - shell: | - echo "Not activated!" - -- builder: - name: 'xtesting-verify-build-aarch64-builders-macro' - builders: - - shell: | - echo "Not activated!" - -- builder: - name: 'xtesting-upload-doc-artifact' - builders: - - shell: | - cd $WORKSPACE && tox -edocs - wget -O - https://git.opnfv.org/releng/plain/utils/upload-artifact.sh | bash -s "api/_build" "docs" ################################ # job publishers ################################ @@ -253,13 +165,3 @@ unhealthy: 40 failing: 30 - email-jenkins-admins-on-failure - -- publisher: - name: 'xtesting-verify-build-x86_64-publishers-macro' - publishers: - - email-jenkins-admins-on-failure - -- publisher: - name: 'xtesting-verify-build-aarch64-publishers-macro' - publishers: - - email-jenkins-admins-on-failure diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml index 3f86b0530..48c0952cc 100644 --- a/jjb/functest/xtesting.yaml +++ b/jjb/functest/xtesting.yaml @@ -10,10 +10,10 @@ tag: - latest: branch: master + - iruya: + branch: stable/iruya - hunter: branch: stable/hunter - - gambia: - branch: stable/gambia - parameter: name: xtesting-slave @@ -98,6 +98,7 @@ fi sudo docker run --rm \ -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \ + -e DEBUG=true \ $image run_tests -t {test} res=$? gsutil -m cp -r $WORKSPACE/ \ @@ -246,20 +247,20 @@ ref: $branch - project: - name: 'xtesting-_-alpine-3.8-rmi' + name: 'xtesting-_-alpine-3.9-rmi' repo: _ port: container: alpine - tag: 3.8 + tag: 3.9 jobs: - 'xtesting-{repo}-{container}-{tag}-rmi' - project: - name: 'xtesting-_-alpine-3.8-pull' + name: 'xtesting-_-alpine-3.9-pull' repo: _ port: container: alpine - tag: 3.8 + tag: 3.9 jobs: - 'xtesting-{repo}-{container}-{tag}-pull' @@ -295,12 +296,12 @@ - multijob: name: remove dependencies projects: - - name: 'xtesting-_-alpine-3.8-rmi' + - name: 'xtesting-_-alpine-3.9-rmi' <<: *xtesting-jobs - multijob: name: pull dependencies projects: - - name: 'xtesting-_-alpine-3.8-pull' + - name: 'xtesting-_-alpine-3.9-pull' <<: *xtesting-jobs - multijob: name: opnfv/functest-xtesting @@ -367,12 +368,12 @@ - multijob: name: remove dependencies projects: - - name: 'xtesting-_-alpine-3.8-rmi' + - name: 'xtesting-_-alpine-3.9-rmi' <<: *xtesting-jobs - multijob: name: pull dependencies projects: - - name: 'xtesting-_-alpine-3.8-pull' + - name: 'xtesting-_-alpine-3.9-pull' <<: *xtesting-jobs - multijob: name: opnfv/functest-xtesting diff --git a/jjb/global/releng-defaults.yaml b/jjb/global/releng-defaults.yaml index e584107c8..a6ee7fa3d 100644 --- a/jjb/global/releng-defaults.yaml +++ b/jjb/global/releng-defaults.yaml @@ -17,6 +17,12 @@ gerrit-server-name: 'gerrit.opnfv.org' jenkins-ssh-credential: 'd42411ac011ad6f3dd2e1fa34eaa5d87f910eb2e' lftools-version: '<1.0.0' + throttle_categories: [] + throttle-enabled: true + throttle-max-per-node: 1 + throttle-max-total: 2 + throttle-option: project + properties: - logrotate-default diff --git a/jjb/global/slave-params.yaml b/jjb/global/slave-params.yaml index 4ff5d6799..c759cf3a5 100644 --- a/jjb/global/slave-params.yaml +++ b/jjb/global/slave-params.yaml @@ -22,6 +22,23 @@ description: 'SSH key to use for Apex' - parameter: + name: 'apex-baremetal-hunter-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'apex-baremetal-master' + all-nodes: false + node-eligibility: 'ignore-offline' + - 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-gambia-defaults' parameters: - label: @@ -108,6 +125,23 @@ description: 'SSH key to use for Apex' - parameter: + name: 'apex-virtual-hunter-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'apex-virtual-master' + all-nodes: false + node-eligibility: 'ignore-offline' + - 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-gambia-defaults' parameters: - label: diff --git a/jjb/releng/opnfv-docker-arm.yaml b/jjb/releng/opnfv-docker-arm.yaml index 7e87c5f0d..6ec3c8992 100644 --- a/jjb/releng/opnfv-docker-arm.yaml +++ b/jjb/releng/opnfv-docker-arm.yaml @@ -23,6 +23,10 @@ stream: gambia branch: 'stable/{stream}' disabled: false + hunter: &hunter + stream: hunter + branch: 'stable/{stream}' + disabled: false dovetail-arm-receivers: &dovetail-arm-receivers receivers: > cristina.pauna@enea.com @@ -44,6 +48,7 @@ dockerdir: "docker" docker_repo_name: "opnfv/{project}_aarch64" arch_tag: "" + extra_build_args: "" # yamllint disable rule:key-duplicates dockerrepo: @@ -133,7 +138,7 @@ <<: *storperf-arm-receivers - 'yardstick': project: 'yardstick' - <<: *gambia + <<: *hunter <<: *yardstick-arm-receivers # yamllint enable rule:key-duplicates @@ -177,6 +182,10 @@ name: ARCH_TAG default: "{arch_tag}" description: "If set, this value will be added to the docker image tag" + - string: + name: EXTRA_BUILD_ARGS + default: "{extra_build_args}" + description: "Whitespace separated key=value pairs. If set, these args will be used to build docker image" properties: - throttle: diff --git a/jjb/releng/opnfv-docker.sh b/jjb/releng/opnfv-docker.sh index e64764128..174bb57b9 100644 --- a/jjb/releng/opnfv-docker.sh +++ b/jjb/releng/opnfv-docker.sh @@ -130,12 +130,18 @@ if [[ -n "${ARCH_TAG}" ]]; then ARCH_BUILD_ARG="--build-arg ARCH=${ARCH_TAG}" fi +EXTRA_BUILD_ARGS=${EXTRA_BUILD_ARGS:-} +if [ -n "${EXTRA_BUILD_ARGS}" ]; then + EXTRA_BUILD_ARGS=" "$(echo ${EXTRA_BUILD_ARGS}) + EXTRA_BUILD_ARGS=${EXTRA_BUILD_ARGS// / --build-arg } +fi + # Start the build echo "Building docker image: $DOCKER_REPO_NAME:$DOCKER_TAG" echo "--------------------------------------------------------" echo cmd="docker build --pull=true --no-cache -t $DOCKER_REPO_NAME:$DOCKER_TAG --build-arg BRANCH=$BUILD_BRANCH - $ARCH_BUILD_ARG + $ARCH_BUILD_ARG $EXTRA_BUILD_ARGS -f $DOCKERFILE $DOCKER_PATH" echo ${cmd} diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml index 591452a74..5b3dae949 100644 --- a/jjb/releng/opnfv-docker.yaml +++ b/jjb/releng/opnfv-docker.yaml @@ -27,6 +27,10 @@ stream: gambia branch: 'stable/{stream}' disabled: false + hunter: &hunter + stream: hunter + branch: 'stable/{stream}' + disabled: false pharos-tools-receivers: &pharos_tools_receivers receivers: > pberberian@iol.unh.edu @@ -36,15 +40,14 @@ mark.beierl@emc.com yardstick-receivers: &yardstick-receivers receivers: > - limingjiang@huawei.com rexlee8776@gmail.com - emma.l.foley@intel.com other-receivers: &other-receivers receivers: '' dockerfile: "Dockerfile" dockerdir: "docker" arch_tag: "" + extra_build_args: "" # This is the dockerhub repo the image will be pushed to as # 'opnfv/{dockerrepo}. See: DOCKER_REPO_NAME parameter. @@ -203,6 +206,12 @@ dockerfile: 'Dockerfile.web' <<: *master <<: *other-receivers + - 'dovetail-webportal-web-onap': + project: 'dovetail-webportal' + dockerfile: 'Dockerfile.web' + extra_build_args: 'CONTAINER=onap GUI=onap-ui' + <<: *master + <<: *other-receivers - 'nfvbench': project: 'nfvbench' <<: *master @@ -363,7 +372,7 @@ <<: *storperf-receivers - 'yardstick': project: 'yardstick' - <<: *gambia + <<: *hunter <<: *yardstick-receivers # projects with jobs for fraser - 'bottlenecks': @@ -415,6 +424,7 @@ dockerfile: "Dockerfile" dockerdir: "docker" arch_tag: "" + extra_build_args: "" project: # projects with jobs for master @@ -466,6 +476,10 @@ name: ARCH_TAG default: "{arch_tag}" description: "If set, this value will be added to the docker image tag as a prefix" + - string: + name: EXTRA_BUILD_ARGS + default: "{extra_build_args}" + description: "Whitespace separated key=value pairs. If set, these args will be used to build docker image" properties: - throttle: diff --git a/jjb/releng/releng-info-vote.yaml b/jjb/releng/releng-info-vote.yaml new file mode 100644 index 000000000..83818585a --- /dev/null +++ b/jjb/releng/releng-info-vote.yaml @@ -0,0 +1,6 @@ +--- +- project: + name: info-vote + build-node: lf-build2 + jobs: + - 'info-vote-verify' diff --git a/jjb/releng/releng-release-jobs.yaml b/jjb/releng/releng-release-jobs.yaml index d79771fea..784d648bc 100644 --- a/jjb/releng/releng-release-jobs.yaml +++ b/jjb/releng/releng-release-jobs.yaml @@ -16,6 +16,7 @@ - fraser - gambia - hunter + - iruya jobs: - 'releng-release-{stream}-verify' diff --git a/jjb/sfc/sfc-project-jobs.yaml b/jjb/sfc/sfc-project-jobs.yaml index 31f7aa6f5..47a6b542f 100644 --- a/jjb/sfc/sfc-project-jobs.yaml +++ b/jjb/sfc/sfc-project-jobs.yaml @@ -16,14 +16,14 @@ branch: '{stream}' gs-pathname: '' disabled: false - - gambia: &gambia - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - disabled: false - fraser: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: true + - hunter: &hunter + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false - job-template: name: 'sfc-verify-{stream}' diff --git a/jjb/sfc/sfc-rtd-jobs.yaml b/jjb/sfc/sfc-rtd-jobs.yaml index f7d4c9b08..a65da54d4 100644 --- a/jjb/sfc/sfc-rtd-jobs.yaml +++ b/jjb/sfc/sfc-rtd-jobs.yaml @@ -12,7 +12,7 @@ - master: branch: '{stream}' disabled: false - - gambia: + - hunter: branch: 'stable/{stream}' disabled: false diff --git a/jjb/vswitchperf/vswitchperf-rtd-jobs.yaml b/jjb/vswitchperf/vswitchperf-rtd-jobs.yaml index 998124066..bf4f5944f 100644 --- a/jjb/vswitchperf/vswitchperf-rtd-jobs.yaml +++ b/jjb/vswitchperf/vswitchperf-rtd-jobs.yaml @@ -13,6 +13,10 @@ - master: branch: '{stream}' disabled: false + - hunter: &hunter + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false - gambia: branch: 'stable/{stream}' disabled: false diff --git a/jjb/vswitchperf/vswitchperf.yaml b/jjb/vswitchperf/vswitchperf.yaml index 9e987fe2e..d46a6cf5f 100644 --- a/jjb/vswitchperf/vswitchperf.yaml +++ b/jjb/vswitchperf/vswitchperf.yaml @@ -15,7 +15,11 @@ branch: '{stream}' gs-pathname: '' disabled: false - - gambia: &gambia + - hunter: &hunter + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false + - gambia: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false diff --git a/jjb/yardstick/yardstick-daily-jobs.yaml b/jjb/yardstick/yardstick-daily-jobs.yaml index 1c622acf2..bab3ce9c5 100644 --- a/jjb/yardstick/yardstick-daily-jobs.yaml +++ b/jjb/yardstick/yardstick-daily-jobs.yaml @@ -15,28 +15,11 @@ branch: '{stream}' gs-pathname: '' docker-tag: 'latest' - gambia: &gambia - stream: gambia + hunter: &hunter + stream: hunter branch: 'stable/{stream}' gs-pathname: '{stream}' docker-tag: 'stable' - # Temporary fraser entry, until all fraser-tied PODs below migrate to gambia - fraser: &fraser - stream: fraser - branch: 'stable/{stream}' - gs-pathname: '{stream}' - # In the meantime, docker image 'stable' will carry gambia contents, and - # there is no implemented way to build a docker image with 'fraser' tag. - # Available docker image tag options, as of 2018-10-03: - # - 'opnfv-6.2.1', built on 2018-07-02, is rather old. - # - 'ovp-2.0.0', built on 2018-09-21, is a good fit despite its name: it - # was built using SHA1 6c10a2d9cc3fe10e0bdd73a0985ab767b9479afc, which - # is the same as used for the most recent 'stable' docker image carrying - # fraser contents, built on 2018-09-13 and used so far by the fraser- - # tied PODs below. - # The alternative would be to create a new 'opnfv-6.2.2' git tag, but that - # would just build another image using the same SHA1 as for 'ovp-2.0.0'. - docker-tag: 'ovp-2.0.0' # ------------------------------- # POD, INSTALLER, AND BRANCH MAPPING # ------------------------------- @@ -61,22 +44,12 @@ slave-label: apex-virtual-master installer: apex auto-trigger-name: 'daily-trigger-disabled' - <<: *gambia + <<: *hunter - baremetal: slave-label: apex-baremetal-master installer: apex auto-trigger-name: 'daily-trigger-disabled' - <<: *gambia - - virtual: - slave-label: apex-virtual-fraser - installer: apex - auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser - - baremetal: - slave-label: apex-baremetal-fraser - installer: apex - auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser + <<: *hunter # fuel CI PODs - baremetal: slave-label: fuel-baremetal @@ -92,12 +65,12 @@ slave-label: fuel-baremetal installer: fuel auto-trigger-name: 'daily-trigger-disabled' - <<: *gambia + <<: *hunter - virtual: slave-label: fuel-virtual installer: fuel auto-trigger-name: 'daily-trigger-disabled' - <<: *gambia + <<: *hunter # armband CI PODs - armband-baremetal: slave-label: armband-baremetal @@ -113,12 +86,12 @@ slave-label: armband-baremetal installer: fuel auto-trigger-name: 'daily-trigger-disabled' - <<: *gambia + <<: *hunter - armband-virtual: slave-label: armband-virtual installer: fuel auto-trigger-name: 'daily-trigger-disabled' - <<: *gambia + <<: *hunter # joid CI PODs - baremetal: slave-label: joid-baremetal @@ -134,12 +107,12 @@ slave-label: joid-baremetal installer: joid auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser + <<: *hunter - virtual: slave-label: joid-virtual installer: joid auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser + <<: *hunter # compass CI PODs - baremetal: slave-label: compass-baremetal @@ -155,22 +128,12 @@ slave-label: compass-baremetal installer: compass auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser - - virtual: - slave-label: compass-virtual - installer: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser - - baremetal: - slave-label: compass-baremetal - installer: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *gambia + <<: *hunter - virtual: slave-label: compass-virtual installer: compass auto-trigger-name: 'daily-trigger-disabled' - <<: *gambia + <<: *hunter # daisy CI PODs - baremetal: slave-label: daisy-baremetal @@ -181,7 +144,7 @@ slave-label: daisy-baremetal installer: daisy auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser + <<: *hunter - virtual: slave-label: daisy-virtual installer: daisy @@ -204,7 +167,7 @@ slave-label: '{pod}' installer: fuel auto-trigger-name: 'daily-trigger-disabled' - <<: *gambia + <<: *hunter - zte-pod2: slave-label: '{pod}' installer: daisy @@ -219,7 +182,7 @@ slave-label: '{pod}' installer: daisy auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser + <<: *hunter - zte-pod9: slave-label: '{pod}' installer: daisy @@ -229,7 +192,7 @@ slave-label: '{pod}' installer: daisy auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser + <<: *hunter - orange-pod2: slave-label: '{pod}' installer: joid @@ -387,7 +350,7 @@ description: 'Arguments to use in order to choose the backend DB' - parameter: - name: 'yardstick-params-apex-virtual-fraser' + name: 'yardstick-params-apex-virtual-hunter' parameters: - string: name: YARDSTICK_DB_BACKEND @@ -395,7 +358,7 @@ description: 'Arguments to use in order to choose the backend DB' - parameter: - name: 'yardstick-params-apex-baremetal-fraser' + name: 'yardstick-params-apex-baremetal-hunter' parameters: - string: name: YARDSTICK_DB_BACKEND diff --git a/jjb/yardstick/yardstick-daily.sh b/jjb/yardstick/yardstick-daily.sh index 58d590c27..dfe1404f0 100755 --- a/jjb/yardstick/yardstick-daily.sh +++ b/jjb/yardstick/yardstick-daily.sh @@ -38,7 +38,11 @@ elif [[ ${INSTALLER_TYPE} == 'compass' ]]; then echo "export OS_CACERT=/etc/yardstick/os_cacert" >> ${HOME}/opnfv-openrc.sh fi elif [[ ${INSTALLER_TYPE} == 'fuel' ]]; then - cacert_file_vol="-v ${HOME}/os_cacert:/etc/ssl/certs/mcp_os_cacert" + if [[ "${DEPLOY_SCENARIO:0:2}" == 'k8' ]]; then + rc_file_vol="-v ${HOME}/admin.conf:/etc/yardstick/admin.conf" + else + cacert_file_vol="-v ${HOME}/os_cacert:/etc/ssl/certs/mcp_os_cacert" + fi sshkey="-v ${SSH_KEY}:/root/.ssh/mcp.rsa" fi diff --git a/jjb/yardstick/yardstick-get-k8s-conf.sh b/jjb/yardstick/yardstick-get-k8s-conf.sh index 116d2f0d0..82744a4ee 100755 --- a/jjb/yardstick/yardstick-get-k8s-conf.sh +++ b/jjb/yardstick/yardstick-get-k8s-conf.sh @@ -9,5 +9,8 @@ if [[ "${DEPLOY_SCENARIO:0:2}" == "k8" ]];then elif [[ ${INSTALLER_TYPE} == 'compass' ]];then echo "Copy admin.conf to ${dest_path}" docker cp compass-tasks:/opt/admin.conf "${dest_path}" + elif [[ ${INSTALLER_TYPE} == 'fuel' ]];then + echo "Getting kubernetes config ..." + docker cp -L fuel:/opt/kubernetes.config "${dest_path}" fi fi diff --git a/jjb/yardstick/yardstick-project-jobs.yaml b/jjb/yardstick/yardstick-project-jobs.yaml index ace2e0265..726760ef5 100644 --- a/jjb/yardstick/yardstick-project-jobs.yaml +++ b/jjb/yardstick/yardstick-project-jobs.yaml @@ -17,11 +17,7 @@ branch: '{stream}' gs-pathname: '' disabled: false - - gambia: &gambia - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - disabled: false - - fraser: + - hunter: &hunter branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false diff --git a/jjb/yardstick/yardstick-rtd-jobs.yaml b/jjb/yardstick/yardstick-rtd-jobs.yaml index a18a6550b..213ec6ac2 100644 --- a/jjb/yardstick/yardstick-rtd-jobs.yaml +++ b/jjb/yardstick/yardstick-rtd-jobs.yaml @@ -12,7 +12,7 @@ - master: branch: '{stream}' disabled: false - - gambia: + - hunter: branch: 'stable/{stream}' disabled: false |