diff options
Diffstat (limited to 'jjb')
| -rwxr-xr-x | jjb/3rd_party_ci/functest-netvirt.sh | 7 | ||||
| -rw-r--r-- | jjb/3rd_party_ci/odl-netvirt.yml | 12 | ||||
| -rw-r--r-- | jjb/doctor/doctor.yml | 107 | ||||
| -rw-r--r-- | jjb/fuel/fuel-daily-jobs.yml | 204 | ||||
| -rwxr-xr-x | jjb/fuel/fuel-plugin-build.sh | 10 | ||||
| -rwxr-xr-x | jjb/fuel/fuel-plugin-test.sh | 10 | ||||
| -rw-r--r-- | jjb/fuel/fuel-plugin-verify-jobs.yml | 236 | ||||
| -rw-r--r-- | jjb/fuel/fuel-project-jobs.yml | 4 | ||||
| -rw-r--r-- | jjb/fuel/fuel-verify-jobs.yml | 4 | ||||
| -rw-r--r-- | jjb/global/releng-macros.yml | 24 | ||||
| -rw-r--r-- | jjb/global/slave-params.yml | 14 | ||||
| -rwxr-xr-x | jjb/infra/bifrost-upload-logs.sh | 29 | ||||
| -rw-r--r-- | jjb/infra/bifrost-verify-jobs.yml | 11 | ||||
| -rwxr-xr-x | jjb/infra/bifrost-verify.sh | 53 | ||||
| -rw-r--r-- | jjb/releng/testapi-automate.yml | 66 | ||||
| -rw-r--r-- | jjb/releng/testapi-docker-update.sh | 18 | ||||
| -rw-r--r-- | jjb/releng/testapi-run-tests.sh | 17 | ||||
| -rw-r--r-- | jjb/storperf/storperf.yml | 5 |
18 files changed, 330 insertions, 501 deletions
diff --git a/jjb/3rd_party_ci/functest-netvirt.sh b/jjb/3rd_party_ci/functest-netvirt.sh deleted file mode 100755 index adffaf42d..000000000 --- a/jjb/3rd_party_ci/functest-netvirt.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -set -e - -# wipe the WORKSPACE -/bin/rm -rf $WORKSPACE/* - -echo "Hello World" diff --git a/jjb/3rd_party_ci/odl-netvirt.yml b/jjb/3rd_party_ci/odl-netvirt.yml index ca1936156..054761ea7 100644 --- a/jjb/3rd_party_ci/odl-netvirt.yml +++ b/jjb/3rd_party_ci/odl-netvirt.yml @@ -20,8 +20,6 @@ slave-label: 'ericsson-virtual5' - 'install-netvirt': slave-label: 'odl-netvirt-virtual' - - 'functest': - slave-label: 'odl-netvirt-virtual' - 'postprocess': slave-label: 'odl-netvirt-virtual' ##################################### @@ -119,9 +117,8 @@ name: functest condition: SUCCESSFUL projects: - - name: 'functest-netvirt-virtual-suite-{stream}' + - name: 'functest-netvirt-virtual-daily-{stream}' predefined-parameters: | - FUNCTEST_SUITE_NAME=vping_userdata,bgpvpn RC_FILE_PATH=/home/jenkins/cloner-info/overcloudrc DEPLOY_SCENARIO=os-odl_l2-bgpvpn-noha node-parameters: true @@ -162,7 +159,7 @@ use-build-blocker: true blocking-jobs: - 'odl-netvirt-verify-virtual-install-.*' - - 'odl-netvirt-verify-virtual-functest-.*' + - 'functest-netvirt-virtual-daily-.*' - 'odl-netvirt-verify-virtual-postprocess-.*' block-level: 'NODE' @@ -200,11 +197,6 @@ - shell: !include-raw: ./install-netvirt.sh - builder: - name: 'netvirt-verify-functest-builder' - builders: - - shell: - !include-raw: ./functest-netvirt.sh -- builder: name: 'netvirt-verify-postprocess-builder' builders: - shell: diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml index ab9ef8f6c..62f89e686 100644 --- a/jjb/doctor/doctor.yml +++ b/jjb/doctor/doctor.yml @@ -24,10 +24,17 @@ - 'sample' - 'congress' + task: + - verify: + profiler: 'none' + auto-trigger-name: 'doctor-verify' + - profiling: + profiler: 'poc' + auto-trigger-name: 'experimental' + jobs: - 'doctor-verify-{stream}' - - 'doctor-verify-{installer}-{inspector}-{stream}' - - 'doctor-profiling-{stream}' + - 'doctor-{task}-{installer}-{inspector}-{stream}': - job-template: name: 'doctor-verify-{stream}' @@ -71,7 +78,7 @@ - shell: "[ -e tests/run.sh ] && bash -n ./tests/run.sh" - job-template: - name: 'doctor-verify-{installer}-{inspector}-{stream}' + name: 'doctor-{task}-{installer}-{inspector}-{stream}' node: '{slave-label}' @@ -107,7 +114,7 @@ default: '{project}' - string: name: TESTCASE_OPTIONS - default: '-e INSPECTOR_TYPE={inspector} -v $WORKSPACE:/home/opnfv/repos/doctor' + default: '-e INSPECTOR_TYPE={inspector} -e PROFILER_TYPE={profiler} -v $WORKSPACE:/home/opnfv/repos/doctor' description: 'Addtional parameters specific to test case(s)' # functest-parameter - string: @@ -131,32 +138,9 @@ - git-scm-gerrit triggers: - - gerrit: - server-name: 'gerrit.opnfv.org' - trigger-on: - - patchset-created-event: - exclude-drafts: 'false' - exclude-trivial-rebase: 'false' - exclude-no-code-change: 'false' - - draft-published-event - - comment-added-contains-event: - comment-contains-value: 'recheck' - - comment-added-contains-event: - comment-contains-value: 'reverify' - projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - file-paths: - - compare-type: ANT - pattern: 'tests/**' - skip-vote: - successful: true - failed: true - unstable: true - notbuilt: true + - '{auto-trigger-name}': + project: '{project}' + branch: '{branch}' builders: - 'functest-suite-builder' @@ -172,65 +156,36 @@ - archive: artifacts: 'tests/*.log' -- job-template: - name: 'doctor-profiling-{stream}' - - disabled: '{obj:disabled}' - - parameters: - - 'doctor-defaults': - project: '{project}' - branch: '{branch}' - - string: - name: PROFILER - default: poc - description: "Profiler to be used" - - scm: - - git-scm-gerrit - - triggers: - - 'experimental': - project: '{project}' - branch: '{branch}' - -##################################### -# parameter macros -##################################### -# TODO(yujunz) replace common parameter in doctor-verify-{stream} with macro -- parameter: - name: 'doctor-defaults' - parameters: - - project-parameter: - project: '{project}' - - gerrit-parameter: - branch: '{branch}' - - 'opnfv-build-ubuntu-defaults' ##################################### # trigger macros ##################################### -# TODO(yujunz) move to opnfv commom - trigger: - name: 'experimental' + name: 'doctor-verify' triggers: - gerrit: server-name: 'gerrit.opnfv.org' trigger-on: + - patchset-created-event: + exclude-drafts: 'false' + exclude-trivial-rebase: 'false' + exclude-no-code-change: 'false' + - draft-published-event + - comment-added-contains-event: + comment-contains-value: 'recheck' - comment-added-contains-event: - comment-contains-value: 'check-experimental' + comment-contains-value: 'reverify' projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - file-paths: - - compare-type: 'ANT' - pattern: 'tests/**' + - project-compare-type: 'ANT' + project-pattern: '{project}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + file-paths: + - compare-type: ANT + pattern: 'tests/**' skip-vote: successful: true failed: true unstable: true notbuilt: true - silent-start: true diff --git a/jjb/fuel/fuel-daily-jobs.yml b/jjb/fuel/fuel-daily-jobs.yml index 87488c886..cd22c1ac2 100644 --- a/jjb/fuel/fuel-daily-jobs.yml +++ b/jjb/fuel/fuel-daily-jobs.yml @@ -15,10 +15,10 @@ branch: '{stream}' disabled: false gs-pathname: '' - colorado: &colorado - stream: colorado + danube: &danube + stream: danube branch: 'stable/{stream}' - disabled: false + disabled: true gs-pathname: '/{stream}' #-------------------------------- # POD, INSTALLER, AND BRANCH MAPPING @@ -34,10 +34,10 @@ <<: *master - baremetal: slave-label: fuel-baremetal - <<: *colorado + <<: *danube - virtual: slave-label: fuel-virtual - <<: *colorado + <<: *danube #-------------------------------- # None-CI PODs #-------------------------------- @@ -52,10 +52,10 @@ <<: *master - zte-pod1: slave-label: zte-pod1 - <<: *colorado + <<: *danube - zte-pod3: slave-label: zte-pod3 - <<: *colorado + <<: *danube #-------------------------------- # scenarios #-------------------------------- @@ -340,81 +340,81 @@ triggers: - timed: '' #----------------------------------------------- -# Triggers for job running on fuel-baremetal against colorado branch +# Triggers for job running on fuel-baremetal against danube branch #----------------------------------------------- # HA Scenarios - trigger: - name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-colorado-trigger' + name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-danube-trigger' triggers: - timed: '0 20 * * *' - trigger: - name: 'fuel-os-odl_l2-nofeature-ha-baremetal-daily-colorado-trigger' + name: 'fuel-os-odl_l2-nofeature-ha-baremetal-daily-danube-trigger' triggers: - timed: '0 23 * * *' - trigger: - name: 'fuel-os-odl_l3-nofeature-ha-baremetal-daily-colorado-trigger' + name: 'fuel-os-odl_l3-nofeature-ha-baremetal-daily-danube-trigger' triggers: - timed: '0 2 * * *' - trigger: - name: 'fuel-os-onos-sfc-ha-baremetal-daily-colorado-trigger' + name: 'fuel-os-onos-sfc-ha-baremetal-daily-danube-trigger' triggers: - timed: '0 5 * * *' - trigger: - name: 'fuel-os-onos-nofeature-ha-baremetal-daily-colorado-trigger' + name: 'fuel-os-onos-nofeature-ha-baremetal-daily-danube-trigger' triggers: - timed: '0 8 * * *' - trigger: - name: 'fuel-os-odl_l2-sfc-ha-baremetal-daily-colorado-trigger' + name: 'fuel-os-odl_l2-sfc-ha-baremetal-daily-danube-trigger' triggers: - timed: '0 11 * * *' - trigger: - name: 'fuel-os-odl_l2-bgpvpn-ha-baremetal-daily-colorado-trigger' + name: 'fuel-os-odl_l2-bgpvpn-ha-baremetal-daily-danube-trigger' triggers: - timed: '0 14 * * *' - trigger: - name: 'fuel-os-nosdn-kvm-ha-baremetal-daily-colorado-trigger' + name: 'fuel-os-nosdn-kvm-ha-baremetal-daily-danube-trigger' triggers: - timed: '0 17 * * *' - trigger: - name: 'fuel-os-nosdn-ovs-ha-baremetal-daily-colorado-trigger' + name: 'fuel-os-nosdn-ovs-ha-baremetal-daily-danube-trigger' triggers: - timed: '0 20 * * *' # NOHA Scenarios - trigger: - name: 'fuel-os-nosdn-nofeature-noha-baremetal-daily-colorado-trigger' + name: 'fuel-os-nosdn-nofeature-noha-baremetal-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-nofeature-noha-baremetal-daily-colorado-trigger' + name: 'fuel-os-odl_l2-nofeature-noha-baremetal-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l3-nofeature-noha-baremetal-daily-colorado-trigger' + name: 'fuel-os-odl_l3-nofeature-noha-baremetal-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-onos-sfc-noha-baremetal-daily-colorado-trigger' + name: 'fuel-os-onos-sfc-noha-baremetal-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-onos-nofeature-noha-baremetal-daily-colorado-trigger' + name: 'fuel-os-onos-nofeature-noha-baremetal-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-sfc-noha-baremetal-daily-colorado-trigger' + name: 'fuel-os-odl_l2-sfc-noha-baremetal-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-bgpvpn-noha-baremetal-daily-colorado-trigger' + name: 'fuel-os-odl_l2-bgpvpn-noha-baremetal-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-kvm-noha-baremetal-daily-colorado-trigger' + name: 'fuel-os-nosdn-kvm-noha-baremetal-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-ovs-noha-baremetal-daily-colorado-trigger' + name: 'fuel-os-nosdn-ovs-noha-baremetal-daily-danube-trigger' triggers: - timed: '' #----------------------------------------------- @@ -494,79 +494,79 @@ triggers: - timed: '5 9 * * *' #----------------------------------------------- -# Triggers for job running on fuel-virtual against colorado branch +# Triggers for job running on fuel-virtual against danube branch #----------------------------------------------- - trigger: - name: 'fuel-os-nosdn-nofeature-ha-virtual-daily-colorado-trigger' + name: 'fuel-os-nosdn-nofeature-ha-virtual-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-nofeature-ha-virtual-daily-colorado-trigger' + name: 'fuel-os-odl_l2-nofeature-ha-virtual-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l3-nofeature-ha-virtual-daily-colorado-trigger' + name: 'fuel-os-odl_l3-nofeature-ha-virtual-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-onos-sfc-ha-virtual-daily-colorado-trigger' + name: 'fuel-os-onos-sfc-ha-virtual-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-onos-nofeature-ha-virtual-daily-colorado-trigger' + name: 'fuel-os-onos-nofeature-ha-virtual-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-bgpvpn-ha-virtual-daily-colorado-trigger' + name: 'fuel-os-odl_l2-bgpvpn-ha-virtual-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-sfc-ha-virtual-daily-colorado-trigger' + name: 'fuel-os-odl_l2-sfc-ha-virtual-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-kvm-ha-virtual-daily-colorado-trigger' + name: 'fuel-os-nosdn-kvm-ha-virtual-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-ovs-ha-virtual-daily-colorado-trigger' + name: 'fuel-os-nosdn-ovs-ha-virtual-daily-danube-trigger' triggers: - timed: '' # NOHA Scenarios - trigger: - name: 'fuel-os-nosdn-nofeature-noha-virtual-daily-colorado-trigger' + name: 'fuel-os-nosdn-nofeature-noha-virtual-daily-danube-trigger' triggers: - timed: '0 13 * * *' - trigger: - name: 'fuel-os-odl_l2-nofeature-noha-virtual-daily-colorado-trigger' + name: 'fuel-os-odl_l2-nofeature-noha-virtual-daily-danube-trigger' triggers: - timed: '30 15 * * *' - trigger: - name: 'fuel-os-odl_l3-nofeature-noha-virtual-daily-colorado-trigger' + name: 'fuel-os-odl_l3-nofeature-noha-virtual-daily-danube-trigger' triggers: - timed: '0 18 * * *' - trigger: - name: 'fuel-os-onos-sfc-noha-virtual-daily-colorado-trigger' + name: 'fuel-os-onos-sfc-noha-virtual-daily-danube-trigger' triggers: - timed: '30 20 * * *' - trigger: - name: 'fuel-os-onos-nofeature-noha-virtual-daily-colorado-trigger' + name: 'fuel-os-onos-nofeature-noha-virtual-daily-danube-trigger' triggers: - timed: '0 23 * * *' - trigger: - name: 'fuel-os-odl_l2-sfc-noha-virtual-daily-colorado-trigger' + name: 'fuel-os-odl_l2-sfc-noha-virtual-daily-danube-trigger' triggers: - timed: '30 1 * * *' - trigger: - name: 'fuel-os-odl_l2-bgpvpn-noha-virtual-daily-colorado-trigger' + name: 'fuel-os-odl_l2-bgpvpn-noha-virtual-daily-danube-trigger' triggers: - timed: '0 4 * * *' - trigger: - name: 'fuel-os-nosdn-kvm-noha-virtual-daily-colorado-trigger' + name: 'fuel-os-nosdn-kvm-noha-virtual-daily-danube-trigger' triggers: - timed: '30 6 * * *' - trigger: - name: 'fuel-os-nosdn-ovs-noha-virtual-daily-colorado-trigger' + name: 'fuel-os-nosdn-ovs-noha-virtual-daily-danube-trigger' triggers: - timed: '0 9 * * *' #----------------------------------------------- @@ -799,231 +799,231 @@ triggers: - timed: '' #----------------------------------------------- -# ZTE POD1 Triggers running against colorado branch +# ZTE POD1 Triggers running against danube branch #----------------------------------------------- - trigger: - name: 'fuel-os-nosdn-nofeature-ha-zte-pod1-daily-colorado-trigger' + name: 'fuel-os-nosdn-nofeature-ha-zte-pod1-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-nofeature-ha-zte-pod1-daily-colorado-trigger' + name: 'fuel-os-odl_l2-nofeature-ha-zte-pod1-daily-danube-trigger' triggers: - timed: '0 2 * * *' - trigger: - name: 'fuel-os-odl_l3-nofeature-ha-zte-pod1-daily-colorado-trigger' + name: 'fuel-os-odl_l3-nofeature-ha-zte-pod1-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-onos-sfc-ha-zte-pod1-daily-colorado-trigger' + name: 'fuel-os-onos-sfc-ha-zte-pod1-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-onos-nofeature-ha-zte-pod1-daily-colorado-trigger' + name: 'fuel-os-onos-nofeature-ha-zte-pod1-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-bgpvpn-ha-zte-pod1-daily-colorado-trigger' + name: 'fuel-os-odl_l2-bgpvpn-ha-zte-pod1-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-sfc-ha-zte-pod1-daily-colorado-trigger' + name: 'fuel-os-odl_l2-sfc-ha-zte-pod1-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-kvm-ha-zte-pod1-daily-colorado-trigger' + name: 'fuel-os-nosdn-kvm-ha-zte-pod1-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-ovs-ha-zte-pod1-daily-colorado-trigger' + name: 'fuel-os-nosdn-ovs-ha-zte-pod1-daily-danube-trigger' triggers: - timed: '' # NOHA Scenarios - trigger: - name: 'fuel-os-nosdn-nofeature-noha-zte-pod1-daily-colorado-trigger' + name: 'fuel-os-nosdn-nofeature-noha-zte-pod1-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-nofeature-noha-zte-pod1-daily-colorado-trigger' + name: 'fuel-os-odl_l2-nofeature-noha-zte-pod1-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l3-nofeature-noha-zte-pod1-daily-colorado-trigger' + name: 'fuel-os-odl_l3-nofeature-noha-zte-pod1-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-onos-sfc-noha-zte-pod1-daily-colorado-trigger' + name: 'fuel-os-onos-sfc-noha-zte-pod1-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-onos-nofeature-noha-zte-pod1-daily-colorado-trigger' + name: 'fuel-os-onos-nofeature-noha-zte-pod1-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-sfc-noha-zte-pod1-daily-colorado-trigger' + name: 'fuel-os-odl_l2-sfc-noha-zte-pod1-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-bgpvpn-noha-zte-pod1-daily-colorado-trigger' + name: 'fuel-os-odl_l2-bgpvpn-noha-zte-pod1-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-kvm-noha-zte-pod1-daily-colorado-trigger' + name: 'fuel-os-nosdn-kvm-noha-zte-pod1-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-ovs-noha-zte-pod1-daily-colorado-trigger' + name: 'fuel-os-nosdn-ovs-noha-zte-pod1-daily-danube-trigger' triggers: - timed: '' #----------------------------------------------- -# ZTE POD2 Triggers running against colorado branch +# ZTE POD2 Triggers running against danube branch #----------------------------------------------- - trigger: - name: 'fuel-os-nosdn-nofeature-ha-zte-pod2-daily-colorado-trigger' + name: 'fuel-os-nosdn-nofeature-ha-zte-pod2-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-nofeature-ha-zte-pod2-daily-colorado-trigger' + name: 'fuel-os-odl_l2-nofeature-ha-zte-pod2-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l3-nofeature-ha-zte-pod2-daily-colorado-trigger' + name: 'fuel-os-odl_l3-nofeature-ha-zte-pod2-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-onos-sfc-ha-zte-pod2-daily-colorado-trigger' + name: 'fuel-os-onos-sfc-ha-zte-pod2-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-onos-nofeature-ha-zte-pod2-daily-colorado-trigger' + name: 'fuel-os-onos-nofeature-ha-zte-pod2-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-bgpvpn-ha-zte-pod2-daily-colorado-trigger' + name: 'fuel-os-odl_l2-bgpvpn-ha-zte-pod2-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-sfc-ha-zte-pod2-daily-colorado-trigger' + name: 'fuel-os-odl_l2-sfc-ha-zte-pod2-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-kvm-ha-zte-pod2-daily-colorado-trigger' + name: 'fuel-os-nosdn-kvm-ha-zte-pod2-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-ovs-ha-zte-pod2-daily-colorado-trigger' + name: 'fuel-os-nosdn-ovs-ha-zte-pod2-daily-danube-trigger' triggers: - timed: '' # NOHA Scenarios - trigger: - name: 'fuel-os-nosdn-nofeature-noha-zte-pod2-daily-colorado-trigger' + name: 'fuel-os-nosdn-nofeature-noha-zte-pod2-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-nofeature-noha-zte-pod2-daily-colorado-trigger' + name: 'fuel-os-odl_l2-nofeature-noha-zte-pod2-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l3-nofeature-noha-zte-pod2-daily-colorado-trigger' + name: 'fuel-os-odl_l3-nofeature-noha-zte-pod2-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-onos-sfc-noha-zte-pod2-daily-colorado-trigger' + name: 'fuel-os-onos-sfc-noha-zte-pod2-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-onos-nofeature-noha-zte-pod2-daily-colorado-trigger' + name: 'fuel-os-onos-nofeature-noha-zte-pod2-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-sfc-noha-zte-pod2-daily-colorado-trigger' + name: 'fuel-os-odl_l2-sfc-noha-zte-pod2-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-bgpvpn-noha-zte-pod2-daily-colorado-trigger' + name: 'fuel-os-odl_l2-bgpvpn-noha-zte-pod2-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-kvm-noha-zte-pod2-daily-colorado-trigger' + name: 'fuel-os-nosdn-kvm-noha-zte-pod2-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-ovs-noha-zte-pod2-daily-colorado-trigger' + name: 'fuel-os-nosdn-ovs-noha-zte-pod2-daily-danube-trigger' triggers: - timed: '' #----------------------------------------------- -# ZTE POD3 Triggers running against colorado branch +# ZTE POD3 Triggers running against danube branch #----------------------------------------------- - trigger: - name: 'fuel-os-nosdn-nofeature-ha-zte-pod3-daily-colorado-trigger' + name: 'fuel-os-nosdn-nofeature-ha-zte-pod3-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-nofeature-ha-zte-pod3-daily-colorado-trigger' + name: 'fuel-os-odl_l2-nofeature-ha-zte-pod3-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l3-nofeature-ha-zte-pod3-daily-colorado-trigger' + name: 'fuel-os-odl_l3-nofeature-ha-zte-pod3-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-onos-sfc-ha-zte-pod3-daily-colorado-trigger' + name: 'fuel-os-onos-sfc-ha-zte-pod3-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-onos-nofeature-ha-zte-pod3-daily-colorado-trigger' + name: 'fuel-os-onos-nofeature-ha-zte-pod3-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-bgpvpn-ha-zte-pod3-daily-colorado-trigger' + name: 'fuel-os-odl_l2-bgpvpn-ha-zte-pod3-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-sfc-ha-zte-pod3-daily-colorado-trigger' + name: 'fuel-os-odl_l2-sfc-ha-zte-pod3-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-kvm-ha-zte-pod3-daily-colorado-trigger' + name: 'fuel-os-nosdn-kvm-ha-zte-pod3-daily-danube-trigger' triggers: - timed: '0 18 * * *' - trigger: - name: 'fuel-os-nosdn-ovs-ha-zte-pod3-daily-colorado-trigger' + name: 'fuel-os-nosdn-ovs-ha-zte-pod3-daily-danube-trigger' triggers: - timed: '' # NOHA Scenarios - trigger: - name: 'fuel-os-nosdn-nofeature-noha-zte-pod3-daily-colorado-trigger' + name: 'fuel-os-nosdn-nofeature-noha-zte-pod3-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-nofeature-noha-zte-pod3-daily-colorado-trigger' + name: 'fuel-os-odl_l2-nofeature-noha-zte-pod3-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l3-nofeature-noha-zte-pod3-daily-colorado-trigger' + name: 'fuel-os-odl_l3-nofeature-noha-zte-pod3-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-onos-sfc-noha-zte-pod3-daily-colorado-trigger' + name: 'fuel-os-onos-sfc-noha-zte-pod3-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-onos-nofeature-noha-zte-pod3-daily-colorado-trigger' + name: 'fuel-os-onos-nofeature-noha-zte-pod3-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-sfc-noha-zte-pod3-daily-colorado-trigger' + name: 'fuel-os-odl_l2-sfc-noha-zte-pod3-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-bgpvpn-noha-zte-pod3-daily-colorado-trigger' + name: 'fuel-os-odl_l2-bgpvpn-noha-zte-pod3-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-kvm-noha-zte-pod3-daily-colorado-trigger' + name: 'fuel-os-nosdn-kvm-noha-zte-pod3-daily-danube-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-ovs-noha-zte-pod3-daily-colorado-trigger' + name: 'fuel-os-nosdn-ovs-noha-zte-pod3-daily-danube-trigger' triggers: - timed: '' diff --git a/jjb/fuel/fuel-plugin-build.sh b/jjb/fuel/fuel-plugin-build.sh deleted file mode 100755 index f7f613dc0..000000000 --- a/jjb/fuel/fuel-plugin-build.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [[ "$JOB_NAME" =~ (verify|merge|daily|weekly) ]]; then - JOB_TYPE=${BASH_REMATCH[0]} -else - echo "Unable to determine job type!" - exit 1 -fi - -echo "Not activated!" diff --git a/jjb/fuel/fuel-plugin-test.sh b/jjb/fuel/fuel-plugin-test.sh deleted file mode 100755 index f7f613dc0..000000000 --- a/jjb/fuel/fuel-plugin-test.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [[ "$JOB_NAME" =~ (verify|merge|daily|weekly) ]]; then - JOB_TYPE=${BASH_REMATCH[0]} -else - echo "Unable to determine job type!" - exit 1 -fi - -echo "Not activated!" diff --git a/jjb/fuel/fuel-plugin-verify-jobs.yml b/jjb/fuel/fuel-plugin-verify-jobs.yml deleted file mode 100644 index bf847edfe..000000000 --- a/jjb/fuel/fuel-plugin-verify-jobs.yml +++ /dev/null @@ -1,236 +0,0 @@ -- project: - name: 'fuel-plugin-verify-jobs' - - project: 'fuel-plugin' - - installer: 'fuel' -##################################### -# branch definitions -##################################### - stream: - - master: - upstream-branch: '{stream}' - opnfv-branch: 'experimental' - gs-pathname: '' - disabled: false -##################################### -# patch verification phases -##################################### - phase: - - 'build': - slave-label: 'opnfv-build-ubuntu' - - 'test': - slave-label: 'opnfv-build-ubuntu' -##################################### -# jobs -##################################### - jobs: - - 'fuel-verify-plugin-{stream}' - - 'fuel-verify-plugin-{phase}-{stream}' -##################################### -# job templates -##################################### -- job-template: - name: 'fuel-verify-plugin-{stream}' - - project-type: multijob - - disabled: '{obj:disabled}' - - concurrent: true - - properties: - - throttle: - enabled: true - max-total: 4 - option: 'project' - - parameters: - - project-parameter: - project: '{project}' - - gerrit-parameter: - branch: '{upstream-branch}' - description: 'OpenStack branch to use' - - string: - name: OPNFV_BRANCH - default: '{opnfv-branch}' - description: 'OPNFV branch to use' - - 'opnfv-build-defaults' - - 'fuel-verify-plugin-defaults': - gs-pathname: '{gs-pathname}' - - scm: - - git: - url: 'https://git.openstack.org/$GERRIT_PROJECT' - refspec: '$GERRIT_REFSPEC' - branches: - - 'origin/$GERRIT_BRANCH' - skip-tag: true - choosing-strategy: 'gerrit' - timeout: 10 - wipe-workspace: true - - wrappers: - - ssh-agent-wrapper - - timeout: - timeout: 360 - fail: true - - triggers: - - gerrit: - server-name: 'review.openstack.org' - silent-start: false - skip-vote: - successful: true - failed: true - unstable: true - notbuilt: true - escape-quotes: true - trigger-on: - - patchset-created-event: - exclude-drafts: 'false' - exclude-trivial-rebase: 'false' - exclude-no-code-change: 'false' - - comment-added-contains-event: - comment-contains-value: 'recheck' - - comment-added-contains-event: - comment-contains-value: 'reverify' - projects: - - project-compare-type: 'PLAIN' - project-pattern: 'openstack/fuel-plugin-bgpvpn' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{upstream-branch}' - forbidden-file-paths: - - compare-type: ANT - pattern: 'README.md|.gitignore|.gitreview' - - project-compare-type: 'PLAIN' - project-pattern: 'openstack/fuel-plugin-onos' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{upstream-branch}' - forbidden-file-paths: - - compare-type: ANT - pattern: 'README.md|.gitignore|.gitreview' - readable-message: true - - builders: - - description-setter: - description: "Built on $NODE_NAME" - - multijob: - name: build - condition: SUCCESSFUL - projects: - - name: 'fuel-verify-plugin-build-{stream}' - current-parameters: false - predefined-parameters: | - GERRIT_PROJECT=$GERRIT_PROJECT - GERRIT_BRANCH=$GERRIT_BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC - GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER - GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - node-parameters: false - kill-phase-on: FAILURE - abort-all-job: true - - multijob: - name: test - condition: SUCCESSFUL - projects: - - name: 'fuel-verify-plugin-test-{stream}' - current-parameters: false - predefined-parameters: | - GERRIT_PROJECT=$GERRIT_PROJECT - GERRIT_BRANCH=$GERRIT_BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC - GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER - GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - node-parameters: false - kill-phase-on: FAILURE - abort-all-job: true - -- job-template: - name: 'fuel-verify-plugin-{phase}-{stream}' - - disabled: '{obj:disabled}' - - concurrent: true - - properties: - - throttle: - enabled: true - max-total: 6 - option: 'project' - - build-blocker: - use-build-blocker: true - blocking-jobs: - - 'fuel-verify-plugin-test-.*' - block-level: 'NODE' - - parameters: - - project-parameter: - project: '{project}' - - gerrit-parameter: - branch: '{upstream-branch}' - description: 'OpenStack branch to use' - - string: - name: OPNFV_BRANCH - default: '{opnfv-branch}' - description: 'OPNFV branch to use' - - '{slave-label}-defaults' - - '{installer}-defaults' - - 'fuel-verify-plugin-defaults': - gs-pathname: '{gs-pathname}' - - scm: - - git: - url: 'https://git.openstack.org/$GERRIT_PROJECT' - refspec: '$GERRIT_REFSPEC' - branches: - - 'origin/$GERRIT_BRANCH' - skip-tag: true - choosing-strategy: 'gerrit' - timeout: 10 - wipe-workspace: true - - wrappers: - - ssh-agent-wrapper - - timeout: - timeout: 360 - fail: true - - builders: - - description-setter: - description: "Built on $NODE_NAME" - - 'fuel-verify-plugin-{phase}-macro' -##################################### -# builder macros -##################################### -- builder: - name: 'fuel-verify-plugin-build-macro' - builders: - - shell: - !include-raw: ./fuel-plugin-build.sh - -- builder: - name: 'fuel-verify-plugin-test-macro' - builders: - - shell: - !include-raw: ./fuel-plugin-test.sh -##################################### -# parameter macros -##################################### -- parameter: - name: 'fuel-verify-plugin-defaults' - parameters: - - string: - name: BUILD_DIRECTORY - default: $WORKSPACE/build_output - description: "Directory where the build artifact will be located upon the completion of the build." - - string: - name: CACHE_DIRECTORY - default: $HOME/opnfv/cache/$INSTALLER_TYPE - description: "Directory where the cache to be used during the build is located." - - string: - name: GS_URL - default: artifacts.opnfv.org/$PROJECT{gs-pathname} - description: "URL to Google Storage." diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml index 8fdf8deae..731b9bd0d 100644 --- a/jjb/fuel/fuel-project-jobs.yml +++ b/jjb/fuel/fuel-project-jobs.yml @@ -13,10 +13,10 @@ branch: '{stream}' gs-pathname: '' disabled: false - - colorado: + - danube: branch: 'stable/{stream}' gs-pathname: '/{stream}' - disabled: false + disabled: true jobs: - 'fuel-build-daily-{stream}' diff --git a/jjb/fuel/fuel-verify-jobs.yml b/jjb/fuel/fuel-verify-jobs.yml index 4a76d9da7..c5f913e49 100644 --- a/jjb/fuel/fuel-verify-jobs.yml +++ b/jjb/fuel/fuel-verify-jobs.yml @@ -12,10 +12,10 @@ branch: '{stream}' gs-pathname: '' disabled: false - - colorado: + - danube: branch: 'stable/{stream}' gs-pathname: '/{stream}' - disabled: false + disabled: true ##################################### # patch verification phases ##################################### diff --git a/jjb/global/releng-macros.yml b/jjb/global/releng-macros.yml index 10835f6a3..404c3dd69 100644 --- a/jjb/global/releng-macros.yml +++ b/jjb/global/releng-macros.yml @@ -96,6 +96,30 @@ - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' +- trigger: + name: 'experimental' + triggers: + - gerrit: + server-name: 'gerrit.opnfv.org' + trigger-on: + - comment-added-contains-event: + comment-contains-value: 'check-experimental' + projects: + - project-compare-type: 'ANT' + project-pattern: '{project}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + file-paths: + - compare-type: 'ANT' + pattern: 'tests/**' + skip-vote: + successful: true + failed: true + unstable: true + notbuilt: true + silent-start: true + - wrapper: name: ssh-agent-wrapper wrappers: diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml index 39a1b1b9c..9d08487a3 100644 --- a/jjb/global/slave-params.yml +++ b/jjb/global/slave-params.yml @@ -364,6 +364,20 @@ default: /root/.ssh/id_rsa description: 'SSH key to use for Apex' - parameter: + name: 'intel-pod9-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - intel-pod9 + default-slaves: + - intel-pod9 + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' +- parameter: name: 'intel-pod3-defaults' parameters: - node: diff --git a/jjb/infra/bifrost-upload-logs.sh b/jjb/infra/bifrost-upload-logs.sh deleted file mode 100755 index a03365942..000000000 --- a/jjb/infra/bifrost-upload-logs.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -# SPDX-license-identifier: Apache-2.0 -############################################################################## -# Copyright (c) 2016 SUSE. -# 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 -############################################################################## - -set -eu -set -o pipefail - -BIFROST_CONSOLE_LOG="${BUILD_URL}/consoleText" -BIFROST_GS_URL=${BIFROST_LOG_URL/http:/gs:} - -echo "Uploading build logs to ${BIFROST_LOG_URL}" - -echo "Uploading console output" -curl -L ${BIFROST_CONSOLE_LOG} | gsutil cp - ${BIFROST_GS_URL}/console.txt - -[[ ! -d ${WORKSPACE}/logs ]] && exit 0 - -pushd ${WORKSPACE}/logs/ &> /dev/null -for x in *.log; do - echo "Compressing and uploading $x" - tar -czf - $x | gsutil cp - ${BIFROST_GS_URL}/$x.tar.gz -done -popd ${WORKSPACE}/logs &> /dev/null diff --git a/jjb/infra/bifrost-verify-jobs.yml b/jjb/infra/bifrost-verify-jobs.yml index cbe21e256..8184b6343 100644 --- a/jjb/infra/bifrost-verify-jobs.yml +++ b/jjb/infra/bifrost-verify-jobs.yml @@ -142,7 +142,6 @@ builders: - bifrost-set-name - bifrost-build - - bifrost-artifacts-upload publishers: - email: @@ -163,7 +162,7 @@ exclude-no-code-change: 'false' - comment-added-contains-event: comment-contains-value: 'recheck' - custom-url: '* $JOB_NAME $BIFROST_LOG_URL' + custom-url: '* $JOB_NAME $BIFROST_LOG_URL/index.html' silent-start: true projects: - project-compare-type: 'PLAIN' @@ -192,7 +191,7 @@ comment-contains-value: 'recheck' - comment-added-contains-event: comment-contains-value: 'reverify' - custom-url: '* $JOB_NAME $BIFROST_LOG_URL' + custom-url: '* $JOB_NAME $BIFROST_LOG_URL/index.html' projects: - project-compare-type: 'ANT' project-pattern: 'releng' @@ -220,9 +219,3 @@ builders: - shell: !include-raw: ./bifrost-verify.sh - -- builder: - name: bifrost-artifacts-upload - builders: - - shell: - !include-raw: ./bifrost-upload-logs.sh diff --git a/jjb/infra/bifrost-verify.sh b/jjb/infra/bifrost-verify.sh index 9fbb1d0d9..201d3f2d6 100755 --- a/jjb/infra/bifrost-verify.sh +++ b/jjb/infra/bifrost-verify.sh @@ -11,7 +11,51 @@ set -o errexit set -o nounset set -o pipefail -trap fix_ownership EXIT +trap cleanup_and_upload EXIT + +function upload_logs() { + BIFROST_CONSOLE_LOG="${BUILD_URL}/consoleText" + BIFROST_GS_URL=${BIFROST_LOG_URL/http:/gs:} + + echo "Uploading build logs to ${BIFROST_LOG_URL}" + + echo "Uploading console output" + curl -s -L ${BIFROST_CONSOLE_LOG} > build_log.txt + gsutil -q cp -Z build_log.txt ${BIFROST_GS_URL}/build_log.txt + rm build_log.txt + + [[ ! -d ${WORKSPACE}/logs ]] && exit 0 + + pushd ${WORKSPACE}/logs/ &> /dev/null + for x in *.log; do + echo "Compressing and uploading $x" + gsutil -q cp -Z ${x} ${BIFROST_GS_URL}/${x} + done + + echo "Generating the landing page" + cat > index.html <<EOF +<html> +<h1>Build results for <a href=https://$GERRIT_NAME/#/c/$GERRIT_CHANGE_NUMBER/$GERRIT_PATCHSET_NUMBER>$GERRIT_NAME/$GERRIT_CHANGE_NUMBER/$GERRIT_PATCHSET_NUMBER</a></h1> +<h2>Job: $JOB_NAME</h2> +<ul> +<li><a href=${BIFROST_LOG_URL}/build_log.txt>build_log.txt</a></li> +EOF + + for x in *.log; do + echo "<li><a href=${BIFROST_LOG_URL}/${x}>${x}</a></li>" >> index.html + done + + cat >> index.html << EOF +</ul> +</html> +EOF + + gsutil -q cp index.html ${BIFROST_GS_URL}/index.html + + rm index.html + + popd &> /dev/null +} function fix_ownership() { if [ -z "${JOB_URL+x}" ]; then @@ -25,6 +69,13 @@ function fix_ownership() { fi } +function cleanup_and_upload() { + original_exit=$? + fix_ownership + upload_logs + exit $original_exit +} + # check distro to see if we support it if [[ ! "$DISTRO" =~ (trusty|centos7|suse) ]]; then echo "Distro $DISTRO is not supported!" diff --git a/jjb/releng/testapi-automate.yml b/jjb/releng/testapi-automate.yml index 0566c3fd6..c03835279 100644 --- a/jjb/releng/testapi-automate.yml +++ b/jjb/releng/testapi-automate.yml @@ -6,9 +6,50 @@ gs-pathname: '' jobs: - 'testapi-automate-{stream}' + - 'testapi-verify-{stream}' + project: 'releng' - job-template: + name: 'testapi-verify-{stream}' + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + - 'opnfv-build-ubuntu-defaults' + + scm: + - git-scm + + triggers: + - gerrit: + server-name: 'gerrit.opnfv.org' + trigger-on: + - patchset-created-event: + exclude-drafts: 'false' + exclude-trivial-rebase: 'false' + exclude-no-code-change: 'false' + - draft-published-event + - comment-added-contains-event: + comment-contains-value: 'recheck' + - comment-added-contains-event: + comment-contains-value: 'reverify' + projects: + - project-compare-type: 'ANT' + project-pattern: '{project}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + file-paths: + - compare-type: 'ANT' + pattern: 'utils/**' + + builders: + - run-unit-tests + +- job-template: name: 'testapi-automate-{stream}' parameters: @@ -16,6 +57,10 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' + - string: + name: DOCKER_TAG + default: "latest" + description: "Tag name for testapi docker image" - 'opnfv-build-defaults' scm: @@ -39,6 +84,7 @@ pattern: 'utils/**' builders: + - docker-update - start-testapi-server - testapi-doc-build - upload-doc-artifact @@ -49,10 +95,16 @@ ################################ - builder: - name: testapi-doc-build + name: run-unit-tests builders: - shell: | - bash ./utils/test/testapi/htmlize/doc-build.sh + bash ./jjb/releng/testapi-run-tests.sh + +- builder: + name: docker-update + builders: + - shell: | + bash ./jjb/releng/testapi-docker-update.sh - builder: name: start-testapi-server @@ -61,13 +113,19 @@ bash ./utils/test/testapi/htmlize/prepare.sh - builder: - name: clean-testapi-server + name: testapi-doc-build builders: - shell: | - bash ./utils/test/testapi/htmlize/finish.sh + bash ./utils/test/testapi/htmlize/doc-build.sh - builder: name: upload-doc-artifact builders: - shell: | bash ./utils/test/testapi/htmlize/push-doc-artifact.sh + +- builder: + name: clean-testapi-server + builders: + - shell: | + bash ./utils/test/testapi/htmlize/finish.sh diff --git a/jjb/releng/testapi-docker-update.sh b/jjb/releng/testapi-docker-update.sh new file mode 100644 index 000000000..84f5c3217 --- /dev/null +++ b/jjb/releng/testapi-docker-update.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +set -o errexit +set -o nounset + +cd $WORKSPACE/utils/test/testapi/docker/ + +# Remove previous containers +docker ps -a | grep "opnfv/testapi" | awk '{ print $1 }' | xargs -r docker rm -f + +# Remove previous images +docker images | grep "opnfv/testapi" | awk '{ print $3 }' | xargs -r docker rmi -f + +# Start build +docker build --no-cache -t opnfv/testapi:$DOCKER_TAG . + +# Push Image +docker push opnfv/testapi:$DOCKER_TAG diff --git a/jjb/releng/testapi-run-tests.sh b/jjb/releng/testapi-run-tests.sh new file mode 100644 index 000000000..47691ed04 --- /dev/null +++ b/jjb/releng/testapi-run-tests.sh @@ -0,0 +1,17 @@ +#!/bin/bash +set -o errexit + +echo "Running unit tests..." + +# Creating virtual environment +virtualenv $WORKSPACE/testapi_test_venv +source $WORKSPACE/testapi_test_venv/bin/activate + +cd $WORKSPACE/utils/test/testapi/ + +# Install requirements +pip install -r requirements.txt +pip install -r test-requirements.txt + +# Run unit tests +bash run_test.sh diff --git a/jjb/storperf/storperf.yml b/jjb/storperf/storperf.yml index 902fff999..8f42f8c06 100644 --- a/jjb/storperf/storperf.yml +++ b/jjb/storperf/storperf.yml @@ -144,15 +144,14 @@ # Required Variables: # stream: branch with - in place of / (eg. stable) # branch: branch (eg. stable) - node: storperf-pod - - disabled: false + disabled: '{obj:disabled}' parameters: - project-parameter: project: '{project}' - gerrit-parameter: branch: '{branch}' + - 'intel-pod9-defaults' scm: - git-scm |