diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/fuel/fuel-daily-jobs.yml | 8 | ||||
| -rwxr-xr-x | jjb/multisite/fuel-deploy-for-multisite.sh | 8 | ||||
| -rw-r--r-- | jjb/multisite/multisite-daily-jobs.yml | 10 |
3 files changed, 17 insertions, 9 deletions
diff --git a/jjb/fuel/fuel-daily-jobs.yml b/jjb/fuel/fuel-daily-jobs.yml index 9e7c3034c..3e79ae85d 100644 --- a/jjb/fuel/fuel-daily-jobs.yml +++ b/jjb/fuel/fuel-daily-jobs.yml @@ -410,11 +410,11 @@ - trigger: name: 'fuel-os-nosdn-kvm_ovs_dpdk-ha-baremetal-daily-danube-trigger' triggers: - - timed: '' + - timed: '0 12 * * *' - trigger: name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-ha-baremetal-daily-danube-trigger' triggers: - - timed: '' + - timed: '0 8 * * *' # NOHA Scenarios - trigger: name: 'fuel-os-nosdn-nofeature-noha-baremetal-daily-danube-trigger' @@ -639,11 +639,11 @@ - trigger: name: 'fuel-os-nosdn-kvm_ovs_dpdk-noha-virtual-daily-danube-trigger' triggers: - - timed: '' + - timed: '0 16 * * *' - trigger: name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-noha-virtual-daily-danube-trigger' triggers: - - timed: '' + - timed: '0 20 * * *' #----------------------------------------------- # ZTE POD1 Triggers running against master branch #----------------------------------------------- diff --git a/jjb/multisite/fuel-deploy-for-multisite.sh b/jjb/multisite/fuel-deploy-for-multisite.sh index 06617610c..71c6cc11d 100755 --- a/jjb/multisite/fuel-deploy-for-multisite.sh +++ b/jjb/multisite/fuel-deploy-for-multisite.sh @@ -19,9 +19,9 @@ else fi export TERM="vt220" - +export BRANCH=$(echo $BRANCH | sed 's/stable\///g') # get the latest successful job console log and extract the properties filename -FUEL_DEPLOY_BUILD_URL="https://build.opnfv.org/ci/job/fuel-deploy-virtual-daily-master/lastSuccessfulBuild/consoleText" +FUEL_DEPLOY_BUILD_URL="https://build.opnfv.org/ci/job/fuel-deploy-virtual-daily-$BRANCH/lastSuccessfulBuild/consoleText" FUEL_PROPERTIES_FILE=$(curl -s -L ${FUEL_DEPLOY_BUILD_URL} | grep 'ISO:' | awk '{print $2}' | sed 's/iso/properties/g') if [[ -z "FUEL_PROPERTIES_FILE" ]]; then echo "Unable to extract the url to Fuel ISO properties from ${FUEL_DEPLOY_URL}" @@ -29,8 +29,8 @@ if [[ -z "FUEL_PROPERTIES_FILE" ]]; then fi # use known/working version of fuel -FUEL_PROPERTIES_FILE="opnfv-2017-03-06_16-00-15.properties" -curl -L -s -o $WORKSPACE/latest.properties http://artifacts.opnfv.org/fuel/$FUEL_PROPERTIES_FILE +#FUEL_PROPERTIES_FILE="opnfv-2017-03-06_16-00-15.properties" +curl -L -s -o $WORKSPACE/latest.properties $GS_PATH/$FUEL_PROPERTIES_FILE # source the file so we get OPNFV vars source latest.properties diff --git a/jjb/multisite/multisite-daily-jobs.yml b/jjb/multisite/multisite-daily-jobs.yml index 23c95f627..06cefb646 100644 --- a/jjb/multisite/multisite-daily-jobs.yml +++ b/jjb/multisite/multisite-daily-jobs.yml @@ -24,7 +24,12 @@ branch: '{stream}' gs-pathname: '' disabled: false - timed: '@midnight' + timed: '0 12 * * *' + - danube: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false + timed: '0 0 * * *' - job-template: name: 'multisite-kingbird-virtual-daily-{stream}' @@ -166,6 +171,9 @@ - string: name: KINGBIRD_LOG_FILE default: $WORKSPACE/kingbird.log + - string: + name: GS_PATH + default: 'http://artifacts.opnfv.org/fuel{gs-pathname}' - 'fuel-defaults' - '{slave-label}-defaults' - choice: |