diff options
| -rw-r--r-- | jjb/armband/armband-ci-jobs.yaml | 56 | ||||
| -rw-r--r-- | jjb/armband/armband-verify-jobs.yaml | 2 | ||||
| -rw-r--r-- | jjb/ci_gate_security/opnfv-ci-gate-security.yaml | 3 | ||||
| -rw-r--r-- | jjb/copper/copper-rtd-jobs.yaml | 13 | ||||
| -rw-r--r-- | jjb/copper/copper.yaml | 8 | ||||
| -rw-r--r-- | jjb/doctor/doctor.yaml | 22 | ||||
| -rw-r--r-- | jjb/fuel/fuel-daily-jobs.yaml | 36 | ||||
| -rw-r--r-- | jjb/fuel/fuel-verify-jobs.yaml | 4 | ||||
| -rw-r--r-- | jjb/global/releng-macros.yaml | 8 | ||||
| -rw-r--r-- | jjb/opnfvdocs/project.cfg | 1 |
10 files changed, 70 insertions, 83 deletions
diff --git a/jjb/armband/armband-ci-jobs.yaml b/jjb/armband/armband-ci-jobs.yaml index df01ddadb..7a878f493 100644 --- a/jjb/armband/armband-ci-jobs.yaml +++ b/jjb/armband/armband-ci-jobs.yaml @@ -81,12 +81,12 @@ auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger' - 'os-nosdn-ovs-ha': auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger' - - 'os-nosdn-vpp-ha': - auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger' # NOHA scenarios - 'os-nosdn-nofeature-noha': auto-trigger-name: '{installer}-{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 @@ -94,7 +94,7 @@ stream: fraser - scenario: os-ovn-nofeature-ha stream: fraser - - scenario: os-nosdn-vpp-ha + - scenario: os-nosdn-fdio-noha stream: fraser jobs: @@ -314,11 +314,7 @@ - trigger: name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-master-trigger' triggers: - - timed: '0 1 * * 2,7' -- trigger: - name: 'fuel-os-nosdn-nofeature-noha-armband-baremetal-master-trigger' - triggers: - - timed: '' + - timed: '0 1 * * 7' - trigger: name: 'fuel-os-odl-nofeature-ha-armband-baremetal-master-trigger' triggers: @@ -326,30 +322,30 @@ - trigger: name: 'fuel-os-ovn-nofeature-ha-armband-baremetal-master-trigger' triggers: - - timed: '0 1 * * 1' + - timed: '0 1 * * 2' - trigger: name: 'fuel-os-nosdn-ovs-ha-armband-baremetal-master-trigger' triggers: - - timed: '0 1 * * 3,5' + - timed: '0 1 * * 1' - trigger: - name: 'fuel-os-nosdn-vpp-ha-armband-baremetal-master-trigger' + name: 'fuel-os-nosdn-nofeature-noha-armband-baremetal-master-trigger' triggers: - timed: '' +- trigger: + name: 'fuel-os-nosdn-fdio-noha-armband-baremetal-master-trigger' + triggers: + - timed: '0 1 * * 3,5' # --------------------------------------------------------------------- # Enea Armband CI Baremetal Triggers running against gambia branch # --------------------------------------------------------------------- - trigger: name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-gambia-trigger' triggers: - - timed: '10 1 * * 1,3' -- trigger: - name: 'fuel-os-nosdn-nofeature-noha-armband-baremetal-gambia-trigger' - triggers: - - timed: '' + - timed: '10 1 * * 1' - trigger: name: 'fuel-os-odl-nofeature-ha-armband-baremetal-gambia-trigger' triggers: - - timed: '10 1 * * 5,7' + - timed: '10 1 * * 7' - trigger: name: 'fuel-os-ovn-nofeature-ha-armband-baremetal-gambia-trigger' triggers: @@ -359,9 +355,13 @@ triggers: - timed: '10 1 * * 4,6' - trigger: - name: 'fuel-os-nosdn-vpp-ha-armband-baremetal-gambia-trigger' + name: 'fuel-os-nosdn-nofeature-noha-armband-baremetal-gambia-trigger' triggers: - timed: '' +- trigger: + name: 'fuel-os-nosdn-fdio-noha-armband-baremetal-gambia-trigger' + triggers: + - timed: '10 1 * * 3,5' # ------------------------------------------------------------------- # Enea Armband CI Baremetal Triggers running against fraser branch (for Dovetail) # ------------------------------------------------------------------- @@ -385,10 +385,6 @@ triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-nofeature-noha-armband-virtual-master-trigger' - triggers: - - timed: '' -- trigger: name: 'fuel-os-odl-nofeature-ha-armband-virtual-master-trigger' triggers: - timed: '' @@ -401,7 +397,11 @@ triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-vpp-ha-armband-virtual-master-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: '' # ------------------------------------------------------------------- @@ -412,10 +412,6 @@ triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-nofeature-noha-armband-virtual-gambia-trigger' - triggers: - - timed: '' -- trigger: name: 'fuel-os-odl-nofeature-ha-armband-virtual-gambia-trigger' triggers: - timed: '' @@ -428,6 +424,10 @@ triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-vpp-ha-armband-virtual-gambia-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/armband/armband-verify-jobs.yaml b/jjb/armband/armband-verify-jobs.yaml index 57d80aeac..0b44a0233 100644 --- a/jjb/armband/armband-verify-jobs.yaml +++ b/jjb/armband/armband-verify-jobs.yaml @@ -28,7 +28,7 @@ - job-template: name: 'armband-verify-{stream}' - disabled: '{obj:disabled}' + disabled: true concurrent: true diff --git a/jjb/ci_gate_security/opnfv-ci-gate-security.yaml b/jjb/ci_gate_security/opnfv-ci-gate-security.yaml index 4c69d6198..ecdb9a16e 100644 --- a/jjb/ci_gate_security/opnfv-ci-gate-security.yaml +++ b/jjb/ci_gate_security/opnfv-ci-gate-security.yaml @@ -26,7 +26,6 @@ - compass4nfv - conductor - container4nfv - - copper - cperf - daisy - doctor @@ -155,7 +154,7 @@ comment-contains-value: 'recheck' projects: - project-compare-type: 'REG_EXP' - project-pattern: 'apex|armband|bamboo|barometer|bottlenecks|calipso|compass4nfv|conductor|copper|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|functest|pharos|releng|sandbox|yardstick|infra|ipv6|kvmfornfv|models|moon|netready' branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' diff --git a/jjb/copper/copper-rtd-jobs.yaml b/jjb/copper/copper-rtd-jobs.yaml deleted file mode 100644 index 6198d2211..000000000 --- a/jjb/copper/copper-rtd-jobs.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -- project: - name: copper-rtd - project: copper - project-name: copper - - gerrit-skip-vote: true - project-pattern: 'copper' - rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-copper/47360/' - rtd-token: '1b423ddc3af602f8078c1ece0d689e0b4d3c3f79' - - jobs: - - '{project-name}-rtd-jobs' diff --git a/jjb/copper/copper.yaml b/jjb/copper/copper.yaml deleted file mode 100644 index 620aefd9c..000000000 --- a/jjb/copper/copper.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- project: - name: copper - - project: '{name}' - - jobs: - - '{project}-verify-basic' diff --git a/jjb/doctor/doctor.yaml b/jjb/doctor/doctor.yaml index 71c519856..5f0e677c8 100644 --- a/jjb/doctor/doctor.yaml +++ b/jjb/doctor/doctor.yaml @@ -90,6 +90,19 @@ kill-phase-on: FAILURE git-revision: true - multijob: + name: 'doctor-verify-fenix' + execution-type: PARALLEL + projects: + - name: 'doctor-verify-maintenance-apex-sample-x86_64-{stream}' + predefined-parameters: | + PROJECT=$PROJECT + GERRIT_BRANCH=$GERRIT_BRANCH + GERRIT_REFSPEC=$GERRIT_REFSPEC + GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER + GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE + kill-phase-on: FAILURE + git-revision: true + - multijob: name: 'doctor-verify-congress' execution-type: PARALLEL projects: @@ -121,6 +134,7 @@ inspector: '{inspector}' scenario: '{scenario}' test_case: 'fault_management' + admin_tool_type: 'sample' scm: - git-scm-gerrit builders: @@ -131,7 +145,7 @@ - job-template: name: 'doctor-verify-maintenance-{installer}-{inspector}-{arch}-{stream}' disabled: '{obj:disabled}' - node: 'nokia-pod1' + node: 'doctor-{installer}-{arch}' wrappers: - ssh-agent-wrapper - build-timeout: @@ -146,6 +160,7 @@ inspector: '{inspector}' scenario: '{scenario}' test_case: 'maintenance' + admin_tool_type: 'fenix' scm: - git-scm-gerrit builders: @@ -171,6 +186,7 @@ inspector: '{inspector}' scenario: '{scenario}' test_case: 'all' + admin_tool_type: 'sample' scm: - git-scm-gerrit builders: @@ -197,6 +213,10 @@ name: DEPLOY_SCENARIO default: '{scenario}' description: 'Scenario to deploy and test' + - string: + name: ADMIN_TOOL_TYPE + default: '{admin_tool_type}' + description: 'admin_tool_type: sample, fenix' # ------------------------------- diff --git a/jjb/fuel/fuel-daily-jobs.yaml b/jjb/fuel/fuel-daily-jobs.yaml index 57ed85fcc..65205707b 100644 --- a/jjb/fuel/fuel-daily-jobs.yaml +++ b/jjb/fuel/fuel-daily-jobs.yaml @@ -69,7 +69,7 @@ auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger' - 'os-nosdn-ovs-ha': auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger' - - 'os-nosdn-vpp-ha': + - 'os-nosdn-fdio-ha': auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger' # NOHA scenarios - 'os-nosdn-nofeature-noha': @@ -86,7 +86,7 @@ auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger' - 'os-nosdn-ovs-noha': auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger' - - 'os-nosdn-vpp-noha': + - 'os-nosdn-fdio-noha': auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger' exclude: @@ -105,11 +105,11 @@ stream: fraser - scenario: os-nosdn-ovs-noha stream: fraser - - scenario: os-nosdn-vpp-noha + - scenario: os-nosdn-fdio-noha stream: fraser - scenario: os-ovn-nofeature-ha stream: fraser - - scenario: os-nosdn-vpp-ha + - scenario: os-nosdn-fdio-ha stream: fraser jobs: @@ -370,7 +370,7 @@ - trigger: name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-master-trigger' triggers: - - timed: '5 20 * * *' + - timed: '5 20 * * 1,2,4,6,7' - trigger: name: 'fuel-os-odl-nofeature-ha-baremetal-daily-master-trigger' triggers: @@ -384,7 +384,7 @@ triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-vpp-ha-baremetal-daily-master-trigger' + name: 'fuel-os-nosdn-fdio-ha-baremetal-daily-master-trigger' triggers: - timed: '' @@ -418,9 +418,9 @@ triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-vpp-noha-baremetal-daily-master-trigger' + name: 'fuel-os-nosdn-fdio-noha-baremetal-daily-master-trigger' triggers: - - timed: '' + - timed: '5 20 * * 3,5' # ---------------------------------------------- # Triggers for job running on fuel-baremetal against gambia branch # ---------------------------------------------- @@ -428,7 +428,7 @@ - trigger: name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-gambia-trigger' triggers: - - timed: '0 20 * * *' + - timed: '0 20 * * 1,2,4,6,7' - trigger: name: 'fuel-os-odl-nofeature-ha-baremetal-daily-gambia-trigger' triggers: @@ -442,7 +442,7 @@ triggers: - timed: '0 5 * * *' - trigger: - name: 'fuel-os-nosdn-vpp-ha-baremetal-daily-gambia-trigger' + name: 'fuel-os-nosdn-fdio-ha-baremetal-daily-gambia-trigger' triggers: - timed: '' # NOHA Scenarios @@ -475,9 +475,9 @@ triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-vpp-noha-baremetal-daily-gambia-trigger' + name: 'fuel-os-nosdn-fdio-noha-baremetal-daily-gambia-trigger' triggers: - - timed: '' + - timed: '0 20 * * 3,5' # ---------------------------------------------- # Triggers for job running on fuel-virtual against master branch # ---------------------------------------------- @@ -498,7 +498,7 @@ triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-vpp-ha-virtual-daily-master-trigger' + name: 'fuel-os-nosdn-fdio-ha-virtual-daily-master-trigger' triggers: - timed: '' # NOHA Scenarios @@ -531,7 +531,7 @@ triggers: - timed: '5 9 * * *' - trigger: - name: 'fuel-os-nosdn-vpp-noha-virtual-daily-master-trigger' + name: 'fuel-os-nosdn-fdio-noha-virtual-daily-master-trigger' triggers: - timed: '' # ---------------------------------------------- @@ -569,7 +569,7 @@ triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-vpp-ha-virtual-daily-gambia-trigger' + name: 'fuel-os-nosdn-fdio-ha-virtual-daily-gambia-trigger' triggers: - timed: '' # NOHA Scenarios @@ -602,7 +602,7 @@ triggers: - timed: '0 9 * * *' - trigger: - name: 'fuel-os-nosdn-vpp-noha-virtual-daily-gambia-trigger' + name: 'fuel-os-nosdn-fdio-noha-virtual-daily-gambia-trigger' triggers: - timed: '' # ---------------------------------------------- @@ -625,7 +625,7 @@ triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-vpp-ha-zte-pod1-daily-master-trigger' + name: 'fuel-os-nosdn-fdio-ha-zte-pod1-daily-master-trigger' triggers: - timed: '' # NOHA Scenarios @@ -658,6 +658,6 @@ triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-vpp-noha-zte-pod1-daily-master-trigger' + name: 'fuel-os-nosdn-fdio-noha-zte-pod1-daily-master-trigger' triggers: - timed: '' diff --git a/jjb/fuel/fuel-verify-jobs.yaml b/jjb/fuel/fuel-verify-jobs.yaml index 9b8b187eb..d31823770 100644 --- a/jjb/fuel/fuel-verify-jobs.yaml +++ b/jjb/fuel/fuel-verify-jobs.yaml @@ -22,13 +22,11 @@ ##################################### # cluster architectures ##################################### + # Note: arm64 was removed since it was basically a no-op arch_tag: - 'amd64': slave-label: 'fuel' functest-suite-label: 'fuel' - - 'arm64': - slave-label: 'armband' - functest-suite-label: 'fuel-armband' ##################################### # cluster types ##################################### diff --git a/jjb/global/releng-macros.yaml b/jjb/global/releng-macros.yaml index 6c37bbbd9..2f156cdb3 100644 --- a/jjb/global/releng-macros.yaml +++ b/jjb/global/releng-macros.yaml @@ -669,14 +669,6 @@ jiaxuan@chinamobile.com - publisher: - name: 'email-copper-ptl' - publishers: - - email-ext: - <<: *email_ptl_defaults - recipients: > - aimeeu.opensource@gmail.com - -- publisher: name: 'email-cperf-ptl' publishers: - email-ext: diff --git a/jjb/opnfvdocs/project.cfg b/jjb/opnfvdocs/project.cfg index 598269737..d5ef6e6f7 100644 --- a/jjb/opnfvdocs/project.cfg +++ b/jjb/opnfvdocs/project.cfg @@ -4,7 +4,6 @@ availability bottlenecks clover compass4nfv -copper conductor container4nfv daisy |