diff options
| -rw-r--r-- | jjb/apex/apex-verify-jobs.yaml | 2 | ||||
| -rw-r--r-- | jjb/dovetail/dovetail-ci-jobs.yaml | 1 | ||||
| -rw-r--r-- | jjb/fuel/fuel-daily-jobs.yaml | 24 | ||||
| -rw-r--r-- | jjb/pharos/shell/deploy-dashboard.sh | 10 |
4 files changed, 32 insertions, 5 deletions
diff --git a/jjb/apex/apex-verify-jobs.yaml b/jjb/apex/apex-verify-jobs.yaml index 9cccf6dcd..15e68261a 100644 --- a/jjb/apex/apex-verify-jobs.yaml +++ b/jjb/apex/apex-verify-jobs.yaml @@ -373,7 +373,7 @@ current-parameters: false predefined-parameters: | DEPLOY_SCENARIO=$DEPLOY_SCENARIO - DOCKER_TAG="" + DOCKER_TAG=$DOCKER_TAG FUNCTEST_SUITE_NAME=tempest_smoke FUNCTEST_MODE=testcase GERRIT_BRANCH=$GERRIT_BRANCH diff --git a/jjb/dovetail/dovetail-ci-jobs.yaml b/jjb/dovetail/dovetail-ci-jobs.yaml index 02a33ccdb..89f402890 100644 --- a/jjb/dovetail/dovetail-ci-jobs.yaml +++ b/jjb/dovetail/dovetail-ci-jobs.yaml @@ -20,6 +20,7 @@ dovetail-branch: '{stream}' gs-pathname: '' docker-tag: 'latest' + disabled: true fraser: &fraser stream: fraser branch: 'stable/{stream}' diff --git a/jjb/fuel/fuel-daily-jobs.yaml b/jjb/fuel/fuel-daily-jobs.yaml index 936187ccb..7d90b0673 100644 --- a/jjb/fuel/fuel-daily-jobs.yaml +++ b/jjb/fuel/fuel-daily-jobs.yaml @@ -75,6 +75,8 @@ auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger' - 'os-odl-sfc-noha': auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger' + - 'os-odl-bgpvpn-noha': + auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger' - 'os-ovn-nofeature-noha': auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger' - 'os-odl-ovs-noha': @@ -92,6 +94,8 @@ stream: fraser - scenario: os-odl-sfc-noha stream: fraser + - scenario: os-odl-bgpvpn-noha + stream: fraser - scenario: os-odl-ovs-noha stream: fraser - scenario: os-ovn-nofeature-noha @@ -394,6 +398,10 @@ triggers: - timed: '' - trigger: + name: 'fuel-os-odl-bgpvpn-noha-baremetal-daily-master-trigger' + triggers: + - timed: '' +- trigger: name: 'fuel-os-ovn-nofeature-noha-baremetal-daily-master-trigger' triggers: - timed: '' @@ -447,6 +455,10 @@ triggers: - timed: '' - trigger: + name: 'fuel-os-odl-bgpvpn-noha-baremetal-daily-gambia-trigger' + triggers: + - timed: '' +- trigger: name: 'fuel-os-ovn-nofeature-noha-baremetal-daily-gambia-trigger' triggers: - timed: '' @@ -499,6 +511,10 @@ triggers: - timed: '5 4 * * *' - trigger: + name: 'fuel-os-odl-bgpvpn-noha-virtual-daily-master-trigger' + triggers: + - timed: '5 6 * * *' +- trigger: name: 'fuel-os-ovn-nofeature-noha-virtual-daily-master-trigger' triggers: - timed: '5 23 * * *' @@ -566,6 +582,10 @@ triggers: - timed: '0 4 * * *' - trigger: + name: 'fuel-os-odl-bgpvpn-noha-virtual-daily-gambia-trigger' + triggers: + - timed: '0 7 * * *' +- trigger: name: 'fuel-os-ovn-nofeature-noha-virtual-daily-gambia-trigger' triggers: - timed: '0 23 * * *' @@ -618,6 +638,10 @@ triggers: - timed: '' - trigger: + name: 'fuel-os-odl-bgpvpn-noha-zte-pod1-daily-master-trigger' + triggers: + - timed: '' +- trigger: name: 'fuel-os-ovn-nofeature-noha-zte-pod1-daily-master-trigger' triggers: - timed: '' diff --git a/jjb/pharos/shell/deploy-dashboard.sh b/jjb/pharos/shell/deploy-dashboard.sh index 4ca41f48c..46a79c326 100644 --- a/jjb/pharos/shell/deploy-dashboard.sh +++ b/jjb/pharos/shell/deploy-dashboard.sh @@ -7,11 +7,13 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## - cp $HOME/config.env $WORKSPACE/dashboard -cp $HOME/rsa.pub $WORKSPACE/dashboard -cp $HOME/rsa.pem $WORKSPACE/dashboard - cd $WORKSPACE/dashboard + docker-compose pull docker-compose up -d + +# Copy JIRA keys into web container +WEB_CONTAINER="$(docker ps --filter 'name=dg01' -q)" +docker cp $HOME/rsa.pub $WEB_CONTAINER:/pharos_dashboard/account/ +docker cp $HOME/rsa.pem $WEB_CONTAINER:/pharos_dashboard/account/ |