diff options
| -rw-r--r-- | jjb/apex/apex.yml | 21 | ||||
| -rw-r--r-- | jjb/fastpathmetrics/fastpathmetrics.yml | 12 | ||||
| -rwxr-xr-x | jjb/fuel/fuel-build.sh | 2 | ||||
| -rw-r--r-- | jjb/fuel/fuel-ci-jobs.yml | 70 | ||||
| -rw-r--r-- | jjb/functest/functest-ci-jobs.yml | 1 |
5 files changed, 31 insertions, 75 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index c90d63192..6c14a8107 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -238,13 +238,13 @@ git-revision: false block: true same-node: true - - trigger-builds: - - project: 'functest-apex-{verify-slave}-suite-{stream1}' - predefined-parameters: | - DEPLOY_SCENARIO=os-nosdn-nofeature-ha - FUNCTEST_SUITE_NAME=healthcheck - block: true - same-node: true +# - trigger-builds: +# - project: 'functest-apex-{verify-slave}-suite-{stream1}' +# predefined-parameters: | +# DEPLOY_SCENARIO=os-nosdn-nofeature-ha +# FUNCTEST_SUITE_NAME=vping_userdata +# block: true +# same-node: true - trigger-builds: - project: 'apex-deploy-virtual-os-odl_l2-nofeature-ha-{stream1}' predefined-parameters: | @@ -253,13 +253,6 @@ git-revision: false block: true same-node: true - - trigger-builds: - - project: 'functest-apex-{verify-slave}-suite-{stream1}' - predefined-parameters: | - DEPLOY_SCENARIO=os-odl_l2-nofeature-ha - FUNCTEST_SUITE_NAME=healthcheck - block: true - same-node: true - 'apex-workspace-cleanup' - job-template: diff --git a/jjb/fastpathmetrics/fastpathmetrics.yml b/jjb/fastpathmetrics/fastpathmetrics.yml index e7dbf26f9..db06afca4 100644 --- a/jjb/fastpathmetrics/fastpathmetrics.yml +++ b/jjb/fastpathmetrics/fastpathmetrics.yml @@ -16,13 +16,17 @@ - master: branch: '{stream}' gs-pathname: '' + disabled: false - brahmaputra: - branch: 'stable/{stream}' - gs-pathname: '/{stream}' + branch: '{stream}' + gs-pathname: '' + disabled: true - job-template: name: 'fastpathmetrics-verify-{stream}' + disabled: '{obj:disabled}' + parameters: - project-parameter: project: '{project}' @@ -70,6 +74,8 @@ project-type: freestyle + disabled: '{obj:disabled}' + concurrent: true properties: @@ -119,6 +125,8 @@ project-type: freestyle + disabled: '{obj:disabled}' + concurrent: true properties: diff --git a/jjb/fuel/fuel-build.sh b/jjb/fuel/fuel-build.sh index a32e5323a..662a1f46e 100755 --- a/jjb/fuel/fuel-build.sh +++ b/jjb/fuel/fuel-build.sh @@ -14,7 +14,7 @@ set -o pipefail cd $WORKSPACE # remove the expired items from cache -./ci/clean_cache.sh $CACHE_DIRECTORY +test -f $WORKSPACE/ci/clean_cache.sh && $WORKSPACE/ci/clean_cache.sh $CACHE_DIRECTORY LATEST_ISO_PROPERTIES=$WORKSPACE/latest.iso.properties if [[ "$JOB_NAME" =~ "daily" ]]; then diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml index bd51dc258..b1d084e97 100644 --- a/jjb/fuel/fuel-ci-jobs.yml +++ b/jjb/fuel/fuel-ci-jobs.yml @@ -37,11 +37,6 @@ - virtual: slave-label: fuel-virtual <<: *brahmaputra - -# just in case if things go wrong - - lf-pod2: - slave-label: '{pod}' - <<: *master #-------------------------------- # None-CI PODs #-------------------------------- @@ -59,12 +54,12 @@ auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger' - 'os-odl_l3-nofeature-ha': auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger' - - 'os-onos-nofeature-ha': - auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger' - - 'os-odl_l2-bgpvpn-ha': + - 'os-onos-sfc-ha': auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger' - 'os-odl_l2-sfc-ha': auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger' + - 'os-odl_l2-bgpvpn-ha': + auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger' - 'os-nosdn-kvm-ha': auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger' - 'os-nosdn-ovs-ha': @@ -227,25 +222,25 @@ - trigger: name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-master-trigger' triggers: - - timed: '' + - timed: '0 19 * * *' - trigger: name: 'fuel-os-odl_l2-nofeature-ha-baremetal-daily-master-trigger' triggers: - - timed: '' + - timed: '0 0 * * *' - trigger: name: 'fuel-os-odl_l3-nofeature-ha-baremetal-daily-master-trigger' triggers: - - timed: '' + - timed: '0 5 * * *' - trigger: - name: 'fuel-os-onos-nofeature-ha-baremetal-daily-master-trigger' + name: 'fuel-os-onos-sfc-ha-baremetal-daily-master-trigger' triggers: - - timed: '' + - timed: '0 10 * * *' - trigger: - name: 'fuel-os-odl_l2-bgpvpn-ha-baremetal-daily-master-trigger' + name: 'fuel-os-odl_l2-sfc-ha-baremetal-daily-master-trigger' triggers: - - timed: '' + - timed: '0 15 * * *' - trigger: - name: 'fuel-os-odl_l2-sfc-ha-baremetal-daily-master-trigger' + name: 'fuel-os-odl_l2-bgpvpn-ha-baremetal-daily-master-trigger' triggers: - timed: '' - trigger: @@ -261,45 +256,6 @@ triggers: - timed: '' #----------------------------------------------- -# Triggers for job running on lf-pod2 against master branch -#----------------------------------------------- -- trigger: - name: 'fuel-os-nosdn-nofeature-ha-lf-pod2-daily-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'fuel-os-odl_l2-nofeature-ha-lf-pod2-daily-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'fuel-os-odl_l3-nofeature-ha-lf-pod2-daily-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'fuel-os-onos-nofeature-ha-lf-pod2-daily-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'fuel-os-odl_l2-bgpvpn-ha-lf-pod2-daily-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'fuel-os-odl_l2-sfc-ha-lf-pod2-daily-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'fuel-os-nosdn-kvm-ha-lf-pod2-daily-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'fuel-os-nosdn-ovs-ha-lf-pod2-daily-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'fuel-os-nosdn-kvm-noha-lf-pod2-daily-master-trigger' - triggers: - - timed: '' -#----------------------------------------------- # Triggers for job running on fuel-virtual against master branch #----------------------------------------------- - trigger: @@ -315,7 +271,7 @@ triggers: - timed: '' - trigger: - name: 'fuel-os-onos-nofeature-ha-virtual-daily-master-trigger' + name: 'fuel-os-onos-sfc-ha-virtual-daily-master-trigger' triggers: - timed: '' - trigger: @@ -354,7 +310,7 @@ triggers: - timed: '' - trigger: - name: 'fuel-os-onos-nofeature-ha-zte-pod1-daily-master-trigger' + name: 'fuel-os-onos-sfc-ha-zte-pod1-daily-master-trigger' triggers: - timed: '' - trigger: diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index 27e1ee333..8bbed4f15 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -200,7 +200,6 @@ - choice: name: FUNCTEST_SUITE_NAME choices: - - 'healthcheck' - 'tempest' - 'rally' - 'odl' |