diff options
43 files changed, 459 insertions, 1003 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 70a38f6b0..012d0bf1f 100644 --- a/jjb/apex/apex.yaml +++ b/jjb/apex/apex.yaml @@ -28,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' @@ -38,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' @@ -72,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': @@ -156,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': @@ -1247,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 @@ -1618,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: | @@ -1658,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: | @@ -1666,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: | @@ -1674,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: | @@ -1682,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: | @@ -1690,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: | @@ -1698,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: | @@ -1706,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: | @@ -1714,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: | @@ -1722,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: | @@ -1730,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: | @@ -1738,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: | @@ -1746,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: | @@ -1754,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: | @@ -1762,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: | @@ -1770,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: | @@ -1778,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: | @@ -1965,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 * *' @@ -2000,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: '' @@ -2074,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 47ea18bbf..90bfb1f91 100644 --- a/jjb/apex/apex.yaml.j2 +++ b/jjb/apex/apex.yaml.j2 @@ -28,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' @@ -38,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' @@ -1147,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 * *' @@ -1182,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: '' @@ -1256,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/barometer/barometer-rtd-jobs.yaml b/jjb/barometer/barometer-rtd-jobs.yaml index 936d1f27f..115677221 100644 --- a/jjb/barometer/barometer-rtd-jobs.yaml +++ b/jjb/barometer/barometer-rtd-jobs.yaml @@ -12,6 +12,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/barometer/barometer.yaml b/jjb/barometer/barometer.yaml index 9cb222a2e..6bc904ea6 100644 --- a/jjb/barometer/barometer.yaml +++ b/jjb/barometer/barometer.yaml @@ -18,7 +18,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 @@ -146,10 +150,8 @@ - timed: '@midnight' builders: - - shell: - !include-raw-escape: ./barometer-build.sh - - shell: - !include-raw-escape: ./barometer-upload-artifact.sh + - shell: !include-raw-escape: ./barometer-build.sh + - shell: !include-raw-escape: ./barometer-upload-artifact.sh ######################## # parameter macros diff --git a/jjb/ci_gate_security/opnfv-ci-gate-security.yaml b/jjb/ci_gate_security/opnfv-ci-gate-security.yaml index ecdb9a16e..af88dd54e 100644 --- a/jjb/ci_gate_security/opnfv-ci-gate-security.yaml +++ b/jjb/ci_gate_security/opnfv-ci-gate-security.yaml @@ -35,7 +35,6 @@ - enfv - fds - fuel - - functest - ipv6 - joid - kvmfornfv @@ -154,7 +153,7 @@ comment-contains-value: 'recheck' projects: - project-compare-type: 'REG_EXP' - project-pattern: 'apex|armband|bamboo|barometer|bottlenecks|calipso|compass4nfv|conductor|cperf|daisy|doctor|dovetail|dpacc|enfv|fds|fuel|functest|pharos|releng|sandbox|yardstick|infra|ipv6|kvmfornfv|models|moon|netready' + project-pattern: 'apex|armband|bamboo|barometer|bottlenecks|calipso|compass4nfv|conductor|cperf|daisy|doctor|dovetail|dpacc|enfv|fds|fuel|pharos|releng|sandbox|yardstick|infra|ipv6|kvmfornfv|models|moon|netready' branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' diff --git a/jjb/edgecloud/edgecloud-rtd-jobs.yaml b/jjb/edgecloud/edgecloud-rtd-jobs.yaml index a3835f3ca..41b013716 100644 --- a/jjb/edgecloud/edgecloud-rtd-jobs.yaml +++ b/jjb/edgecloud/edgecloud-rtd-jobs.yaml @@ -12,6 +12,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/fuel/fuel-daily-jobs.yaml b/jjb/fuel/fuel-daily-jobs.yaml index 3e83502a3..36de6fda7 100644 --- a/jjb/fuel/fuel-daily-jobs.yaml +++ b/jjb/fuel/fuel-daily-jobs.yaml @@ -166,67 +166,6 @@ 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.run proposed_tests testsuite optional test cases against ha scenario - # 6.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' - - project: 'dovetail-fuel-{pod}-proposed_tests-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' - - 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: 'fuel-collect-logs-{pod}-daily-{stream}' current-parameters: false @@ -406,7 +345,7 @@ - trigger: name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-hunter-trigger' triggers: - - timed: '0 20 * * 1,2,4,6,7' + - timed: '0 20 * * 1,4,7' - trigger: name: 'fuel-os-odl-nofeature-ha-baremetal-daily-hunter-trigger' triggers: @@ -443,11 +382,11 @@ - trigger: name: 'fuel-os-ovn-nofeature-noha-baremetal-daily-hunter-trigger' triggers: - - timed: '' + - timed: '0 20 * * 6' - trigger: name: 'fuel-os-odl-ovs-noha-baremetal-daily-hunter-trigger' triggers: - - timed: '' + - timed: '0 20 * * 2' - trigger: name: 'fuel-os-nosdn-ovs-noha-baremetal-daily-hunter-trigger' triggers: diff --git a/jjb/fuel/fuel-verify-jobs.yaml b/jjb/fuel/fuel-verify-jobs.yaml index 540ce7b1b..a5efd2d16 100644 --- a/jjb/fuel/fuel-verify-jobs.yaml +++ b/jjb/fuel/fuel-verify-jobs.yaml @@ -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 b2a976474..4f3c9ef98 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -105,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" @@ -156,6 +157,7 @@ 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 @@ -176,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 diff --git a/jjb/functest/functest-daily-jobs.yaml b/jjb/functest/functest-daily-jobs.yaml index 1a94d5140..45f1e0553 100644 --- a/jjb/functest/functest-daily-jobs.yaml +++ b/jjb/functest/functest-daily-jobs.yaml @@ -69,6 +69,14 @@ - virtual: slave-label: apex-virtual-master installer: apex + <<: *hunter + - baremetal: + slave-label: apex-baremetal-master + installer: apex + <<: *hunter + - virtual: + slave-label: apex-virtual-master + installer: apex <<: *gambia - baremetal: slave-label: apex-baremetal-master diff --git a/jjb/functest/functest-k8.sh b/jjb/functest/functest-k8.sh index 44f6d6ca6..4543f7f01 100755 --- a/jjb/functest/functest-k8.sh +++ b/jjb/functest/functest-k8.sh @@ -4,10 +4,11 @@ set -e set +u set +o pipefail -[[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null" +redirect="/dev/stdout" FUNCTEST_DIR=/home/opnfv/functest admin_conf_file_vol="-v ${HOME}/admin.conf:/root/.kube/config" +cat ${HOME}/admin.conf dir_result="${HOME}/opnfv/functest/results/${BRANCH##*/}" mkdir -p ${dir_result} diff --git a/jjb/functest/functest-kubernetes-project-jobs.yaml b/jjb/functest/functest-kubernetes-project-jobs.yaml index 7fd2525c1..161469bce 100644 --- a/jjb/functest/functest-kubernetes-project-jobs.yaml +++ b/jjb/functest/functest-kubernetes-project-jobs.yaml @@ -11,7 +11,6 @@ jobs: - 'functest-kubernetes-verify-{stream}' - 'functest-kubernetes-verify-{phase}-{stream}' - - 'functest-kubernetes-docs-upload-{stream}' stream: - master: @@ -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-project-jobs.yaml b/jjb/functest/functest-project-jobs.yaml index 57fad77dd..405202ecd 100644 --- a/jjb/functest/functest-project-jobs.yaml +++ b/jjb/functest/functest-project-jobs.yaml @@ -11,7 +11,6 @@ jobs: - 'functest-verify-{stream}' - 'functest-verify-{phase}-{stream}' - - 'functest-docs-upload-{stream}' stream: - master: @@ -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-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-rtd-jobs.yaml b/jjb/functest/functest-rtd-jobs.yaml index 785bd3543..b145ca7c2 100644 --- a/jjb/functest/functest-rtd-jobs.yaml +++ b/jjb/functest/functest-rtd-jobs.yaml @@ -13,6 +13,9 @@ - master: branch: '{stream}' disabled: false + - iruya: + branch: 'stable/{stream}' + disabled: false - gambia: branch: 'stable/{stream}' disabled: false diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml index 9792950b7..074ad737b 100644 --- a/jjb/functest/functest.yaml +++ b/jjb/functest/functest.yaml @@ -10,17 +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 @@ -98,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/ \ @@ -136,7 +143,8 @@ - job-template: name: 'functest-{repo}-{container}-{tag}-pull' parameters: - - functest-slave + - functest-slave: + slave: '{slave}' builders: - functest-pull-containers: <<: *functest-containers @@ -179,7 +187,8 @@ - job-template: name: 'functest-{repo}-{container}-{tag}-rmi' parameters: - - functest-slave + - functest-slave: + slave: '{slave}' builders: - functest-remove-images: <<: *functest-containers @@ -222,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 @@ -309,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|functest-kubernetes)-[a-z]+-(daily|check|gate)$' + - '^functest-{tag}-(daily|check|gate)$' builders: - multijob: name: remove former images @@ -435,7 +446,8 @@ - job-template: name: 'functest-{repo}-{container}-{tag}-gate' parameters: - - functest-slave + - functest-slave: + slave: '{slave}' scm: - functest-scm: ref: $GERRIT_REFSPEC @@ -447,7 +459,8 @@ - job-template: name: 'functest-{repo}-{container}-{tag}-check' parameters: - - functest-slave + - functest-slave: + slave: '{slave}' - functest-branch: branch: '{branch}' scm: @@ -464,6 +477,7 @@ port: container: alpine tag: 3.9 + slave: master jobs: - 'functest-{repo}-{container}-{tag}-rmi' @@ -473,6 +487,7 @@ port: container: alpine tag: 3.9 + slave: master jobs: - 'functest-{repo}-{container}-{tag}-pull' @@ -550,7 +565,8 @@ name: 'functest-{tag}-check' project-type: multijob parameters: - - functest-slave + - functest-slave: + slave: '{slave}' - functest-branch: branch: '{branch}' properties: @@ -558,7 +574,7 @@ use-build-blocker: true blocking-level: 'NODE' blocking-jobs: - - '^(functest|functest-kubernetes)-[a-z]+-(daily|check|gate)$' + - '^functest-{tag}-(daily|check|gate)$' builders: - multijob: name: remove former images @@ -725,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|functest-kubernetes)-[a-z]+-(daily|check|gate)$' + - '^functest-{tag}-(daily|check|gate)$' builders: - multijob: name: remove former images diff --git a/jjb/functest/xtesting-project-jobs.yaml b/jjb/functest/xtesting-project-jobs.yaml index 15c376b38..830740151 100644 --- a/jjb/functest/xtesting-project-jobs.yaml +++ b/jjb/functest/xtesting-project-jobs.yaml @@ -11,7 +11,6 @@ jobs: - 'xtesting-verify-{stream}' - 'xtesting-verify-{phase}-{stream}' - - 'xtesting-docs-upload-{stream}' stream: - master: @@ -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 94e00d16c..48c0952cc 100644 --- a/jjb/functest/xtesting.yaml +++ b/jjb/functest/xtesting.yaml @@ -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/ \ 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/opnfvdocs/docs-rtd.yaml b/jjb/opnfvdocs/docs-rtd.yaml index a8d29e4b4..8906dfdee 100644 --- a/jjb/opnfvdocs/docs-rtd.yaml +++ b/jjb/opnfvdocs/docs-rtd.yaml @@ -1,7 +1,13 @@ --- - project: name: docs-rtd + project: 'opnfvdocs' + project-name: 'opnfvdocs' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfvdocsdemo/79560/' + rtd-token: 'a96c3622a270344cf9bf3f73b0dfa04f59fc59c0' + project-pattern: 'opnfvdocs' jobs: + - '{project-name}-rtd-jobs' - 'docs-merge-rtd-{stream}' - 'docs-verify-rtd-{stream}' @@ -15,10 +21,6 @@ - danube: branch: 'stable/{stream}' - project: 'opnfvdocs' - rtdproject: 'opnfv' - # TODO: Archive Artifacts - - job-template: name: 'docs-merge-rtd-{stream}' @@ -43,14 +45,6 @@ builders: - 'remove-old-docs-from-opnfv-artifacts' - - shell: | - if [ $GERRIT_BRANCH == "master" ]; then - RTD_BUILD_VERSION=latest - else - RTD_BUILD_VERSION=${{GERRIT_BRANCH/\//-}} - fi - curl -X POST --data "version_slug=$RTD_BUILD_VERSION" https://readthedocs.org/build/opnfvdocsdemo - - job-template: name: 'docs-verify-rtd-{stream}' diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml index 5b3dae949..08c08ee82 100644 --- a/jjb/releng/opnfv-docker.yaml +++ b/jjb/releng/opnfv-docker.yaml @@ -377,7 +377,7 @@ # projects with jobs for fraser - 'bottlenecks': project: 'bottlenecks' - <<: *fraser + <<: *hunter <<: *other-receivers - 'clover': project: 'clover' diff --git a/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/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/releases/gambia/functest.yaml b/releases/gambia/functest.yaml index 59c205aa1..a04412ca2 100644 --- a/releases/gambia/functest.yaml +++ b/releases/gambia/functest.yaml @@ -10,12 +10,18 @@ releases: - version: opnfv-7.1.0 location: functest: b21dede23cb7577497fb7adf2775a77c45a37e36 + - version: opnfv-7.2.0 + location: + functest: 312f1481503e44fdb29857d528d8d641e408f929 - version: opnfv-7.0.0 location: functest-kubernetes: fd5c939094244458aea31ead8c6519da95266c2a - version: opnfv-7.1.0 location: functest-kubernetes: fd5c939094244458aea31ead8c6519da95266c2a + - version: opnfv-7.2.0 + location: + functest-kubernetes: 262e3a4e51183388091481a7593b11bc37f295fb branches: - name: stable/gambia diff --git a/releases/hunter/apex.yaml b/releases/hunter/apex.yaml new file mode 100644 index 000000000..397f3da84 --- /dev/null +++ b/releases/hunter/apex.yaml @@ -0,0 +1,23 @@ +# SPDX-License-Identifier: Apache-2.0 +############################################################################## +# Copyright (c) 2018 The Linux Foundation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +project: apex +project-type: installer +release-model: stable +upstream: https://wiki.openstack.org/wiki/TripleO + +releases: + - version: opnfv-8.0.0 + location: + apex: 5a60fc71848a60ee51837b7dc7a49dda741876cd + +branches: + - name: stable/hunter + location: + apex: 8f294ab694a95e60abb29af6f1ef560ae365d436 diff --git a/releases/hunter/barometer.yaml b/releases/hunter/barometer.yaml new file mode 100644 index 000000000..89b3022c9 --- /dev/null +++ b/releases/hunter/barometer.yaml @@ -0,0 +1,17 @@ +# SPDX-License-Identifier: Apache-2.0 +############################################################################## +# Copyright (c) 2018 The Linux Foundation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +project: barometer +project-type: feature +release-model: stable + +branches: + - name: stable/hunter + location: + barometer: 6fe9f36a63e71bd4614260cca0664b02b95c8b9c diff --git a/releases/hunter/bottlenecks.yaml b/releases/hunter/bottlenecks.yaml new file mode 100644 index 000000000..43c055352 --- /dev/null +++ b/releases/hunter/bottlenecks.yaml @@ -0,0 +1,14 @@ +--- +project: bottlenecks +project-type: testing +release-model: stable + +branches: + - name: stable/hunter + location: + bottlenecks: 80edaf3c201bec85fe8a403e03b68899c08df3bb + +releases: + - version: opnfv-8.0.0 + location: + bottlenecks: 80edaf3c201bec85fe8a403e03b68899c08df3bb diff --git a/releases/hunter/clover.yaml b/releases/hunter/clover.yaml index 1bc9288b4..f35dde881 100644 --- a/releases/hunter/clover.yaml +++ b/releases/hunter/clover.yaml @@ -3,7 +3,14 @@ project: clover project-type: feature release-model: stable +releases: + - version: opnfv-8.0.0 + location: + clover: 1301c1842b5b678a1c91ce6d81b1df85135186b6 + branches: - name: stable/hunter location: clover: 3f86a3d611f4d2a4f21d9be2a2284ccf120db36e + +release-notes: https://opnfv-clover.readthedocs.io/en/stable-hunter/release/release-notes/release-notes.html diff --git a/releases/hunter/doctor.yaml b/releases/hunter/doctor.yaml index ff16aec3b..1678d8c17 100644 --- a/releases/hunter/doctor.yaml +++ b/releases/hunter/doctor.yaml @@ -11,7 +11,14 @@ project: doctor project-type: feature release-model: stable +releases: + - version: opnfv-8.0.0 + location: + doctor: 3eb8e9800215f25712d62160042e472f63cec1e1 + branches: - name: stable/hunter location: doctor: 73605c5c34b97ab56306bfa9af0f5888f3c7e46d + +release-notes: https://opnfv-doctor.readthedocs.io/en/stable-hunter/release/release-notes/index.html#doctor-releasenotes diff --git a/releases/hunter/edgecloud.yaml b/releases/hunter/edgecloud.yaml new file mode 100644 index 000000000..54f98f0c5 --- /dev/null +++ b/releases/hunter/edgecloud.yaml @@ -0,0 +1,9 @@ +--- +project: edgecloud +project-type: feature +release-model: stable + +branches: + - name: stable/hunter + location: + edgecloud: 0aa38f991cc8defd2cf46bea93f16938a3d66927 diff --git a/releases/hunter/fuel.yaml b/releases/hunter/fuel.yaml index a97b97dd9..e1e111fc1 100644 --- a/releases/hunter/fuel.yaml +++ b/releases/hunter/fuel.yaml @@ -16,4 +16,9 @@ branches: location: fuel: f021e19b4797eb4f6830d86056fce919f1e1fe01 +releases: + - version: opnfv-8.0.0 + location: + fuel: 4e64c8495d8cddab653e7b6f8db1d4335755d4c9 + release-notes: https://opnfv-fuel.readthedocs.io/en/latest/release/release-notes/release-notes.html diff --git a/releases/hunter/functest.yaml b/releases/hunter/functest.yaml index 064ae056e..19f4431c3 100644 --- a/releases/hunter/functest.yaml +++ b/releases/hunter/functest.yaml @@ -7,9 +7,15 @@ releases: - version: opnfv-8.0.0 location: functest: a3355e22585c66823c430d6adcdef8dddacb33a1 + - version: opnfv-8.1.0 + location: + functest: 924f4a31ef22675630fa6009610074600b4f0e68 - version: opnfv-8.0.0 location: functest-kubernetes: ec2bf0e8bd1b4d3b2c4e2894820d2cbb454e36e7 + - version: opnfv-8.1.0 + location: + functest-kubernetes: d02aa9919eb04974d096fcd54891723482f8d056 branches: - name: stable/hunter diff --git a/releases/hunter/ipv6.yaml b/releases/hunter/ipv6.yaml index 853823795..819100dab 100644 --- a/releases/hunter/ipv6.yaml +++ b/releases/hunter/ipv6.yaml @@ -11,6 +11,11 @@ project: ipv6 project-type: feature release-model: stable +releases: + - version: opnfv-8.0.0 + location: + ipv6: b113174fa52a1ac4bd20bdbdaea86b07897e7091 + branches: - name: stable/hunter location: diff --git a/releases/hunter/opnfvdocs.yaml b/releases/hunter/opnfvdocs.yaml new file mode 100644 index 000000000..7853e028c --- /dev/null +++ b/releases/hunter/opnfvdocs.yaml @@ -0,0 +1,9 @@ +--- +project: opnfvdocs +project-type: infra +release-model: stable + +branches: + - name: stable/hunter + location: + opnfvdocs: e834a1712a717d6ab5f66d3c2b56e39f07f55f68 diff --git a/releases/hunter/samplevnf.yaml b/releases/hunter/samplevnf.yaml new file mode 100644 index 000000000..66d08404c --- /dev/null +++ b/releases/hunter/samplevnf.yaml @@ -0,0 +1,11 @@ +--- +project: samplevnf +project-type: feature +release-model: stable + +branches: + - name: stable/hunter + location: + samplevnf: 8310d0fedb5fc13610b95e100c8639c97892a2b5 + +release-notes: https://opnfv-samplevnf.readthedocs.io/en/latest/release/release-notes/release-notes.html diff --git a/releases/hunter/stor4nfv.yaml b/releases/hunter/stor4nfv.yaml index 8d7fb2208..22bff3b21 100644 --- a/releases/hunter/stor4nfv.yaml +++ b/releases/hunter/stor4nfv.yaml @@ -7,3 +7,5 @@ branches: - name: stable/hunter location: stor4nfv: fe427fc3f69ecc5e104a6fdb2c9f5d82f0254fdb + +release-notes: https://opnfv-stor4nfv.readthedocs.io/en/latest/release/release-notes/release-notes.html diff --git a/releases/hunter/yardstick.yaml b/releases/hunter/yardstick.yaml index 88391b09e..f19ec3a55 100644 --- a/releases/hunter/yardstick.yaml +++ b/releases/hunter/yardstick.yaml @@ -7,3 +7,10 @@ branches: - name: stable/hunter location: yardstick: 85899baa90714ae15add21a330316793071168ae + +releases: + - version: opnfv-8.0.0 + location: + yardstick: 9bd54d7914f4c025d4a50611f726d6154f914c7b + +release-notes: https://opnfv-yardstick.readthedocs.io/en/latest/release/release-notes/release-notes.html diff --git a/releases/iruya/functest.yaml b/releases/iruya/functest.yaml index c9514b8bf..e44d81992 100644 --- a/releases/iruya/functest.yaml +++ b/releases/iruya/functest.yaml @@ -3,6 +3,14 @@ project: functest project-type: testing release-model: stable +releases: + - version: opnfv-9.0.0 + location: + functest: 95aad4cafe073e62b8624dbf7a5d973feee8d988 + - version: opnfv-9.0.0 + location: + functest-kubernetes: 049c730a5cf97eff34c82dc0968d709d4cbec1db + branches: - name: stable/iruya location: |