diff options
| -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 |
6 files changed, 106 insertions, 362 deletions
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 ##################################### |