diff options
Diffstat (limited to 'jjb/compass4nfv')
| -rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yaml | 180 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-deploy.sh | 2 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-dovetail-jobs.yaml | 4 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-project-jobs.yaml | 4 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-verify-jobs.yaml | 23 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass4nfv-rtd-jobs.yaml | 21 |
6 files changed, 141 insertions, 93 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yaml b/jjb/compass4nfv/compass-ci-jobs.yaml index 8eeaabfaa..9dc80748d 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yaml +++ b/jjb/compass4nfv/compass-ci-jobs.yaml @@ -13,14 +13,14 @@ gs-pathname: '' ppa-pathname: '/{stream}' disabled: false - openstack-version: pike - fraser: &fraser - stream: fraser + openstack-version: queens + gambia: &gambia + stream: gambia branch: 'stable/{stream}' disabled: false gs-pathname: '/{stream}' ppa-pathname: '/{stream}' - openstack-version: pike + openstack-version: queens danube: &danube stream: danube branch: 'stable/{stream}' @@ -45,11 +45,11 @@ - baremetal: slave-label: compass-baremetal-branch os-version: 'xenial' - <<: *fraser + <<: *gambia - virtual: slave-label: compass-virtual-branch os-version: 'xenial' - <<: *fraser + <<: *gambia # ------------------------------- # master # ------------------------------- @@ -129,6 +129,9 @@ - 'k8-nosdn-stor4nfv-noha': disabled: false auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' + - 'os-nosdn-stor4nfv-ha': + disabled: false + auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' jobs: - 'compass-{scenario}-{pod}-daily-{stream}' @@ -159,7 +162,7 @@ - 'compass-os-.*?-baremetal-daily-.*?' - 'compass-k8-.*?-baremetal-daily-.*?' - 'compass-verify-[^-]*-[^-]*' - block-level: 'NODE' + blocking-level: 'NODE' wrappers: - fix-workspace-permissions @@ -214,23 +217,17 @@ unstable-threshold: 'FAILURE' # here the stream means the SUT stream, dovetail stream is defined in its own job # only run on os-(nosdn|odl_l3)-nofeature-ha scenario - # run with testsuite default, dovetail docker image with latest tag(Monday, Tuesday) - # run with testsuite proposed_tests, dovetail docker image with latest tag(Thursday, Friday) + # run with testsuite default, testarea mandatory, dovetail docker image with latest tag + # run with testsuite default, testarea optional, dovetail docker image with latest tag - conditional-step: condition-kind: and condition-operands: - condition-kind: regex-match regex: os-(nosdn|odl_l3)-nofeature-ha label: '{scenario}' - - condition-kind: day-of-week - day-selector: select-days - days: - MON: true - TUES: true - use-build-time: true steps: - trigger-builds: - - project: 'dovetail-compass-{pod}-default-{stream}' + - project: 'dovetail-compass-{pod}-default-mandatory-{stream}' current-parameters: false predefined-parameters: | DOCKER_TAG=latest @@ -247,17 +244,12 @@ - condition-kind: regex-match regex: os-(nosdn|odl_l3)-nofeature-ha label: '{scenario}' - - condition-kind: day-of-week - day-selector: select-days - days: - THURS: true - FRI: true - use-build-time: true steps: - trigger-builds: - - project: 'dovetail-compass-{pod}-proposed_tests-{stream}' + - project: 'dovetail-compass-{pod}-default-optional-{stream}' current-parameters: false - predefined-parameters: + predefined-parameters: | + DOCKER_TAG=latest DEPLOY_SCENARIO={scenario} block: true same-node: true @@ -307,6 +299,24 @@ condition-kind: and condition-operands: - condition-kind: regex-match + regex: k8-nosdn-nofeature-ha + label: '{scenario}' + steps: + - trigger-builds: + - project: 'bottlenecks-compass-kubestone_deployment_capacity-{pod}-daily-{stream}' + current-parameters: false + predefined-parameters: + 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: + - condition-kind: regex-match regex: master label: '{stream}' steps: @@ -341,7 +351,7 @@ blocking-jobs: - 'compass-deploy-{pod}-daily-.*?' - 'compass-verify-deploy-.*?' - block-level: 'NODE' + blocking-level: 'NODE' wrappers: - build-name: @@ -379,7 +389,7 @@ !include-raw-escape: ./compass-deploy.sh - conditional-step: condition-kind: regex-match - regex: (danube|fraser) + regex: (danube|gambia) label: '{stream}' steps: - shell: @@ -443,7 +453,7 @@ description: "Directory where the cache to be used during the build is located." - string: name: PPA_REPO - default: "http://artifacts.opnfv.org/compass4nfv/package{ppa-pathname}" + default: "https://artifacts.opnfv.org/compass4nfv/package{ppa-pathname}" - string: name: PPA_CACHE default: "$WORKSPACE/work/repo/" @@ -522,6 +532,10 @@ name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-centos-master-trigger' triggers: - timed: '' +- trigger: + name: 'compass-os-nosdn-stor4nfv-ha-baremetal-centos-master-trigger' + triggers: + - timed: '' # ---------------------------- # noha-baremetal-centos-master @@ -615,6 +629,10 @@ name: 'compass-k8-nosdn-stor4nfv-ha-huawei-pod7-danube-trigger' triggers: - timed: '' +- trigger: + name: 'compass-os-nosdn-stor4nfv-ha-huawei-pod7-danube-trigger' + triggers: + - timed: '' # ---------------------------- # noha-huawei-pod7-danube @@ -707,6 +725,10 @@ name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-master-trigger' triggers: - timed: '0 16 1-29/2 * *' +- trigger: + name: 'compass-os-nosdn-stor4nfv-ha-baremetal-master-trigger' + triggers: + - timed: '0 20 1-29/2 * *' # --------------------- # noha-baremetal-master @@ -745,94 +767,98 @@ - timed: '' # ------------------- -# ha-baremetal-fraser +# ha-baremetal-gambia # ------------------- - trigger: - name: 'compass-os-nosdn-nofeature-ha-baremetal-fraser-trigger' + name: 'compass-os-nosdn-nofeature-ha-baremetal-gambia-trigger' triggers: - timed: '0 1 1-29/2 * *' - trigger: - name: 'compass-os-nosdn-openo-ha-baremetal-fraser-trigger' + name: 'compass-os-nosdn-openo-ha-baremetal-gambia-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl_l3-nofeature-ha-baremetal-fraser-trigger' + name: 'compass-os-odl_l3-nofeature-ha-baremetal-gambia-trigger' triggers: - timed: '0 21 2-30/2 * *' - trigger: - name: 'compass-os-onos-nofeature-ha-baremetal-fraser-trigger' + name: 'compass-os-onos-nofeature-ha-baremetal-gambia-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-ocl-nofeature-ha-baremetal-fraser-trigger' + name: 'compass-os-ocl-nofeature-ha-baremetal-gambia-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-onos-sfc-ha-baremetal-fraser-trigger' + name: 'compass-os-onos-sfc-ha-baremetal-gambia-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl_l2-moon-ha-baremetal-fraser-trigger' + name: 'compass-os-odl_l2-moon-ha-baremetal-gambia-trigger' triggers: - timed: '' # '0 5 1-29/2 * *' - trigger: - name: 'compass-os-nosdn-kvm-ha-baremetal-fraser-trigger' + name: 'compass-os-nosdn-kvm-ha-baremetal-gambia-trigger' triggers: - timed: '0 13 2-30/2 * *' - trigger: - name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-fraser-trigger' + name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-gambia-trigger' triggers: - timed: '0 9 1-29/2 * *' - trigger: - name: 'compass-k8-nosdn-nofeature-ha-baremetal-fraser-trigger' + name: 'compass-k8-nosdn-nofeature-ha-baremetal-gambia-trigger' triggers: - timed: '0 5 1-29/2 * *' - trigger: - name: 'compass-os-odl-sfc-ha-baremetal-fraser-trigger' + name: 'compass-os-odl-sfc-ha-baremetal-gambia-trigger' triggers: - timed: '0 17 2-30/2 * *' - trigger: - name: 'compass-os-nosdn-bar-ha-baremetal-fraser-trigger' + name: 'compass-os-nosdn-bar-ha-baremetal-gambia-trigger' triggers: - timed: '0 21 1-29/2 * *' - trigger: - name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-fraser-trigger' + name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-gambia-trigger' triggers: - timed: '0 7 2-30/2 * *' +- trigger: + name: 'compass-os-nosdn-stor4nfv-ha-baremetal-gambia-trigger' + triggers: + - timed: '' # --------------------- -# noha-baremetal-fraser +# noha-baremetal-gambia # --------------------- - trigger: - name: 'compass-os-nosdn-kvm-noha-baremetal-fraser-trigger' + name: 'compass-os-nosdn-kvm-noha-baremetal-gambia-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-nosdn-nofeature-noha-baremetal-fraser-trigger' + name: 'compass-os-nosdn-nofeature-noha-baremetal-gambia-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl_l3-nofeature-noha-baremetal-fraser-trigger' + name: 'compass-os-odl_l3-nofeature-noha-baremetal-gambia-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl_l2-moon-noha-baremetal-fraser-trigger' + name: 'compass-os-odl_l2-moon-noha-baremetal-gambia-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl-sfc-noha-baremetal-fraser-trigger' + name: 'compass-os-odl-sfc-noha-baremetal-gambia-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-fraser-trigger' + name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-gambia-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-nosdn-bar-noha-baremetal-fraser-trigger' + name: 'compass-os-nosdn-bar-noha-baremetal-gambia-trigger' triggers: - timed: '' - trigger: - name: 'compass-k8-nosdn-stor4nfv-noha-baremetal-fraser-trigger' + name: 'compass-k8-nosdn-stor4nfv-noha-baremetal-gambia-trigger' triggers: - timed: '' @@ -891,6 +917,10 @@ name: 'compass-k8-nosdn-stor4nfv-ha-virtual-master-trigger' triggers: - timed: '0 15 2-30/2 * *' +- trigger: + name: 'compass-os-nosdn-stor4nfv-ha-virtual-master-trigger' + triggers: + - timed: '0 19 2-30/2 * *' # ------------------- # noha-virtual-master @@ -929,93 +959,97 @@ - timed: '0 10 2-30/2 * *' # ----------------- -# ha-virtual-fraser +# ha-virtual-gambia # ----------------- - trigger: - name: 'compass-os-nosdn-nofeature-ha-virtual-fraser-trigger' + name: 'compass-os-nosdn-nofeature-ha-virtual-gambia-trigger' triggers: - timed: '0 23 1-29/2 * *' - trigger: - name: 'compass-os-nosdn-openo-ha-virtual-fraser-trigger' + name: 'compass-os-nosdn-openo-ha-virtual-gambia-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl_l3-nofeature-ha-virtual-fraser-trigger' + name: 'compass-os-odl_l3-nofeature-ha-virtual-gambia-trigger' triggers: - timed: '0 22 2-30/2 * *' - trigger: - name: 'compass-os-onos-nofeature-ha-virtual-fraser-trigger' + name: 'compass-os-onos-nofeature-ha-virtual-gambia-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-ocl-nofeature-ha-virtual-fraser-trigger' + name: 'compass-os-ocl-nofeature-ha-virtual-gambia-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-onos-sfc-ha-virtual-fraser-trigger' + name: 'compass-os-onos-sfc-ha-virtual-gambia-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl_l2-moon-ha-virtual-fraser-trigger' + name: 'compass-os-odl_l2-moon-ha-virtual-gambia-trigger' triggers: - timed: '0 20 1-29/2 * *' - trigger: - name: 'compass-os-nosdn-kvm-ha-virtual-fraser-trigger' + name: 'compass-os-nosdn-kvm-ha-virtual-gambia-trigger' triggers: - timed: '0 16 2-30/2 * *' - trigger: - name: 'compass-os-nosdn-ovs_dpdk-ha-virtual-fraser-trigger' + name: 'compass-os-nosdn-ovs_dpdk-ha-virtual-gambia-trigger' triggers: - timed: '0 14 1-29/2 * *' - trigger: - name: 'compass-os-odl-sfc-ha-virtual-fraser-trigger' + name: 'compass-os-odl-sfc-ha-virtual-gambia-trigger' triggers: - timed: '0 18 2-30/2 * *' - trigger: - name: 'compass-k8-nosdn-nofeature-ha-virtual-fraser-trigger' + name: 'compass-k8-nosdn-nofeature-ha-virtual-gambia-trigger' triggers: - timed: '5 1 2-30/2 * *' - trigger: - name: 'compass-os-nosdn-bar-ha-virtual-fraser-trigger' + name: 'compass-os-nosdn-bar-ha-virtual-gambia-trigger' triggers: - timed: '0 19 1-29/2 * *' - trigger: - name: 'compass-k8-nosdn-stor4nfv-ha-virtual-fraser-trigger' + name: 'compass-k8-nosdn-stor4nfv-ha-virtual-gambia-trigger' triggers: - timed: '0 15 1-29/2 * *' +- trigger: + name: 'compass-os-nosdn-stor4nfv-ha-virtual-gambia-trigger' + triggers: + - timed: '' # ------------------- -# noha-virtual-fraser +# noha-virtual-gambia # ------------------- - trigger: - name: 'compass-os-nosdn-kvm-noha-virtual-fraser-trigger' + name: 'compass-os-nosdn-kvm-noha-virtual-gambia-trigger' triggers: - timed: '0 15 1-29/2 * *' - trigger: - name: 'compass-os-nosdn-nofeature-noha-virtual-fraser-trigger' + name: 'compass-os-nosdn-nofeature-noha-virtual-gambia-trigger' triggers: - timed: '0 17 2-30/2 * *' - trigger: - name: 'compass-os-odl_l3-nofeature-noha-virtual-fraser-trigger' + name: 'compass-os-odl_l3-nofeature-noha-virtual-gambia-trigger' triggers: - timed: '0 23 1-29/2 * *' - trigger: - name: 'compass-os-odl_l2-moon-noha-virtual-fraser-trigger' + name: 'compass-os-odl_l2-moon-noha-virtual-gambia-trigger' triggers: - timed: '0 21 2-30/2 * *' - trigger: - name: 'compass-os-odl-sfc-noha-virtual-fraser-trigger' + name: 'compass-os-odl-sfc-noha-virtual-gambia-trigger' triggers: - timed: '0 19 1-29/2 * *' - trigger: - name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-fraser-trigger' + name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-gambia-trigger' triggers: - timed: '0 12 2-30/2 * *' - trigger: - name: 'compass-os-nosdn-bar-noha-virtual-fraser-trigger' + name: 'compass-os-nosdn-bar-noha-virtual-gambia-trigger' triggers: - timed: '0 12 1-29/2 * *' - trigger: - name: 'compass-k8-nosdn-stor4nfv-noha-virtual-fraser-trigger' + name: 'compass-k8-nosdn-stor4nfv-noha-virtual-gambia-trigger' triggers: - timed: '0 13 2-30/2 * *' diff --git a/jjb/compass4nfv/compass-deploy.sh b/jjb/compass4nfv/compass-deploy.sh index ac649b992..4c5448e33 100644 --- a/jjb/compass4nfv/compass-deploy.sh +++ b/jjb/compass4nfv/compass-deploy.sh @@ -35,6 +35,8 @@ export OPENSTACK_VERSION=${COMPASS_OPENSTACK_VERSION} if [[ "${DEPLOY_SCENARIO}" =~ "-ocl" ]]; then export NETWORK_CONF_FILE=network_ocl.yml +elif [[ "${DEPLOY_SCENARIO}" =~ "-odl" ]]; then + export NETWORK_CONF_FILE=network_odl.yml elif [[ "${DEPLOY_SCENARIO}" =~ "-onos" ]]; then export NETWORK_CONF_FILE=network_onos.yml elif [[ "${DEPLOY_SCENARIO}" =~ "-openo" ]]; then diff --git a/jjb/compass4nfv/compass-dovetail-jobs.yaml b/jjb/compass4nfv/compass-dovetail-jobs.yaml index c09086348..ec62da3b7 100644 --- a/jjb/compass4nfv/compass-dovetail-jobs.yaml +++ b/jjb/compass4nfv/compass-dovetail-jobs.yaml @@ -51,7 +51,7 @@ blocking-jobs: - 'compass-os-.*?-{pod}-daily-.*?' - 'compass-os-.*?-{pod}-weekly-.*?' - block-level: 'NODE' + blocking-level: 'NODE' wrappers: - build-name: @@ -128,7 +128,7 @@ - 'compass-deploy-{pod}-daily-.*?' - 'compass-deploy-{pod}-weekly-.*' - 'compass-verify-deploy-.*?' - block-level: 'NODE' + blocking-level: 'NODE' wrappers: - build-name: diff --git a/jjb/compass4nfv/compass-project-jobs.yaml b/jjb/compass4nfv/compass-project-jobs.yaml index dc935f024..17745a29e 100644 --- a/jjb/compass4nfv/compass-project-jobs.yaml +++ b/jjb/compass4nfv/compass-project-jobs.yaml @@ -20,7 +20,7 @@ gs-pathname: '/{stream}' ppa-pathname: '/{stream}' disabled: false - - fraser: + - gambia: branch: 'stable/{stream}' gs-pathname: '/{stream}' ppa-pathname: '/{stream}' @@ -129,7 +129,7 @@ description: "URL to Google Storage." - string: name: PPA_REPO - default: "http://artifacts.opnfv.org/compass4nfv/package{ppa-pathname}" + default: "https://artifacts.opnfv.org/compass4nfv/package{ppa-pathname}" - string: name: PPA_CACHE default: "$WORKSPACE/work/repo/" diff --git a/jjb/compass4nfv/compass-verify-jobs.yaml b/jjb/compass4nfv/compass-verify-jobs.yaml index c357ff641..daedff797 100644 --- a/jjb/compass4nfv/compass-verify-jobs.yaml +++ b/jjb/compass4nfv/compass-verify-jobs.yaml @@ -14,14 +14,14 @@ gs-pathname: '' ppa-pathname: '/{stream}' disabled: false - openstack-version: 'pike' + openstack-version: 'queens' branch-type: 'master' - - fraser: + - gambia: branch: 'stable/{stream}' gs-pathname: '/{stream}' ppa-pathname: '/{stream}' disabled: false - openstack-version: 'pike' + openstack-version: 'queens' branch-type: 'master' distro: @@ -71,7 +71,7 @@ - 'compass-verify-[^-]*-[^-]*' - 'compass-os-.*?-virtual-daily-.*?' - 'compass-k8-.*?-virtual-daily-.*?' - block-level: 'NODE' + blocking-level: 'NODE' wrappers: - ssh-agent-wrapper @@ -162,15 +162,6 @@ node-parameters: true kill-phase-on: NEVER abort-all-job: true - - name: 'functest-compass-virtual-suite-{stream}' - current-parameters: false - predefined-parameters: | - FUNCTEST_MODE=testcase - FUNCTEST_SUITE_NAME=vping_ssh - DEPLOY_SCENARIO=os-nosdn-nofeature-ha - node-parameters: true - kill-phase-on: NEVER - abort-all-job: true - job-template: name: 'compass-verify-k8-{distro}-{stream}' @@ -193,7 +184,7 @@ blocking-jobs: - 'compass-verify-[^-]*-[^-]*' - 'compass-os-.*?-virtual-daily-.*?' - block-level: 'NODE' + blocking-level: 'NODE' wrappers: - ssh-agent-wrapper @@ -288,7 +279,7 @@ - 'compass-os-.*?-virtual-daily-.*?' - 'compass-verify-deploy-.*' - 'functest-compass-virtual.*' - block-level: 'NODE' + blocking-level: 'NODE' wrappers: - ssh-agent-wrapper @@ -343,7 +334,7 @@ description: "URL to Google Storage." - string: name: PPA_REPO - default: "http://artifacts.opnfv.org/compass4nfv/package{ppa-pathname}" + default: "https://artifacts.opnfv.org/compass4nfv/package{ppa-pathname}" - string: name: PPA_CACHE default: "$WORKSPACE/work/repo/" diff --git a/jjb/compass4nfv/compass4nfv-rtd-jobs.yaml b/jjb/compass4nfv/compass4nfv-rtd-jobs.yaml new file mode 100644 index 000000000..7d136881a --- /dev/null +++ b/jjb/compass4nfv/compass4nfv-rtd-jobs.yaml @@ -0,0 +1,21 @@ +--- +- project: + name: compass4nfv-rtd + project: compass4nfv + project-name: compass4nfv + + gerrit-skip-vote: true + project-pattern: 'compass4nfv' + rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-compass4nfv/47358/' + rtd-token: '4208e8492be2e4eab7f18f1e70b5d78247d1b249' + + stream: + - master: + branch: '{stream}' + disabled: false + - gambia: + branch: 'stable/{stream}' + disabled: false + + jobs: + - '{project-name}-rtd-jobs' |