diff options
Diffstat (limited to 'jjb/fuel')
| -rw-r--r-- | jjb/fuel/fuel-ci-jobs.yml | 14 | ||||
| -rwxr-xr-x | jjb/fuel/fuel-deploy.sh | 4 | ||||
| -rw-r--r-- | jjb/fuel/fuel-project-jobs.yml | 4 |
3 files changed, 13 insertions, 9 deletions
diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml index 0d31c99b4..056b2cc0f 100644 --- a/jjb/fuel/fuel-ci-jobs.yml +++ b/jjb/fuel/fuel-ci-jobs.yml @@ -50,6 +50,12 @@ - zte-pod3: slave-label: zte-pod3 <<: *master + - zte-pod1: + slave-label: zte-pod1 + <<: *colorado + - zte-pod3: + slave-label: zte-pod3 + <<: *colorado #-------------------------------- # scenarios #-------------------------------- @@ -175,7 +181,7 @@ publishers: - email: - recipients: peter.barabas@ericsson.com + recipients: peter.barabas@ericsson.com fzhadaev@mirantis.com - job-template: name: 'fuel-deploy-{pod}-daily-{stream}' @@ -232,7 +238,7 @@ publishers: - email: - recipients: jonas.bjurel@ericsson.com stefan.k.berg@ericsson.com peter.barabas@ericsson.com + recipients: jonas.bjurel@ericsson.com stefan.k.berg@ericsson.com peter.barabas@ericsson.com fzhadaev@mirantis.com ######################## # parameter macros @@ -802,7 +808,7 @@ - trigger: name: 'fuel-os-odl_l2-nofeature-ha-zte-pod1-daily-colorado-trigger' triggers: - - timed: '' + - timed: '0 2 * * *' - trigger: name: 'fuel-os-odl_l3-nofeature-ha-zte-pod1-daily-colorado-trigger' triggers: @@ -979,7 +985,7 @@ - trigger: name: 'fuel-os-nosdn-kvm-ha-zte-pod3-daily-colorado-trigger' triggers: - - timed: '' + - timed: '0 18 * * *' - trigger: name: 'fuel-os-nosdn-ovs-ha-zte-pod3-daily-colorado-trigger' triggers: diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh index 730f0d116..136aac861 100755 --- a/jjb/fuel/fuel-deploy.sh +++ b/jjb/fuel/fuel-deploy.sh @@ -121,7 +121,7 @@ export FUEL_MASTER_IP=10.20.0.2 export TACKER_SCRIPT_URL="https://git.opnfv.org/cgit/fuel/plain/prototypes/sfc_tacker/poc.tacker-up.sh?h=${GIT_BRANCH#*/}" export CONTROLLER_NODE_IP=$(sshpass -pr00tme /usr/bin/ssh -o UserKnownHostsFile=/dev/null \ -o StrictHostKeyChecking=no root@$FUEL_MASTER_IP 'fuel node list' | \ - grep opendaylight | cut -d'|' -f5) + grep controller | head -1 | cut -d'|' -f5) # we can't do much if we do not have the controller IP if [[ ! "$CONTROLLER_NODE_IP" =~ "10.20.0" ]]; then @@ -149,8 +149,6 @@ send "/bin/mkdir -p /root/sfc-poc && cd /root/sfc-poc\r" expect "# " send "git clone https://gerrit.opnfv.org/gerrit/fuel && cd fuel\r" expect "# " -send "git fetch https://gerrit.opnfv.org/gerrit/fuel refs/changes/97/10597/2 && git checkout FETCH_HEAD\r" -expect "# " send "/bin/bash /root/sfc-poc/fuel/prototypes/sfc_tacker/poc.tacker-up.sh\r" expect "# " send "exit\r" diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml index cf893832b..588ab0cd5 100644 --- a/jjb/fuel/fuel-project-jobs.yml +++ b/jjb/fuel/fuel-project-jobs.yml @@ -79,7 +79,7 @@ publishers: - email: - recipients: jonas.bjurel@ericsson.com stefan.k.berg@ericsson.com + recipients: jonas.bjurel@ericsson.com stefan.k.berg@ericsson.com fzhadaev@mirantis.com - job-template: name: 'fuel-merge-build-{stream}' @@ -218,7 +218,7 @@ publishers: - email: - recipients: jonas.bjurel@ericsson.com stefan.k.berg@ericsson.com + recipients: jonas.bjurel@ericsson.com stefan.k.berg@ericsson.com fzhadaev@mirantis.com - job-template: name: 'fuel-deploy-generic-daily-{stream}' |