diff options
Diffstat (limited to 'jjb/multisite/multisite-daily-jobs.yml')
| -rw-r--r-- | jjb/multisite/multisite-daily-jobs.yml | 55 |
1 files changed, 33 insertions, 22 deletions
diff --git a/jjb/multisite/multisite-daily-jobs.yml b/jjb/multisite/multisite-daily-jobs.yml index 437dde9a4..e0dfbfa7e 100644 --- a/jjb/multisite/multisite-daily-jobs.yml +++ b/jjb/multisite/multisite-daily-jobs.yml @@ -9,17 +9,15 @@ phase: - 'fuel-deploy-regionone-virtual': - slave-label: 'ericsson-virtual12' + slave-label: ericsson-virtual12 - 'fuel-deploy-regiontwo-virtual': - slave-label: 'ericsson-virtual13' + slave-label: ericsson-virtual13 - 'register-endpoints': - slave-label: 'ericsson-virtual12' + slave-label: ericsson-virtual12 - 'update-auth': - slave-label: 'ericsson-virtual13' + slave-label: ericsson-virtual13 - 'kingbird-deploy-virtual': - slave-label: 'ericsson-virtual12' - - 'kingbird-functest': - slave-label: 'ericsson-virtual12' + slave-label: ericsson-virtual12 stream: - master: @@ -40,6 +38,11 @@ parameters: - project-parameter: project: '{project}' + - choice: + name: FRESH_INSTALL + choices: + - 'true' + - 'false' - string: name: KINGBIRD_LOG_FILE default: $WORKSPACE/kingbird.log @@ -63,6 +66,7 @@ OS_REGION=RegionOne REGIONONE_IP=100.64.209.10 REGIONTWO_IP=100.64.209.11 + FRESH_INSTALL=$FRESH_INSTALL node-parameters: false node-label-name: SLAVE_LABEL node-label: ericsson-virtual12 @@ -76,6 +80,7 @@ OS_REGION=RegionTwo REGIONONE_IP=100.64.209.10 REGIONTWO_IP=100.64.209.11 + FRESH_INSTALL=$FRESH_INSTALL node-parameters: false node-label-name: SLAVE_LABEL node-label: ericsson-virtual13 @@ -126,10 +131,11 @@ name: kingbird-functest condition: SUCCESSFUL projects: - - name: 'multisite-kingbird-functest-{stream}' + - name: 'functest-fuel-virtual-suite-{stream}' current-parameters: false predefined-parameters: | DEPLOY_SCENARIO='os-nosdn-multisite-noha' + FUNCTEST_SUITE_NAME='multisite' OS_REGION=RegionOne REGIONONE_IP=100.64.209.10 REGIONTWO_IP=100.64.209.11 @@ -156,6 +162,9 @@ default: $WORKSPACE/kingbird.log - '{slave-label}-defaults' + scm: + - git-scm + builders: - description-setter: description: "Built on $NODE_NAME" @@ -171,39 +180,47 @@ - builder: name: 'multisite-fuel-deploy-regionone-virtual-builder' builders: + - shell: + !include-raw-escape: ./fuel-deploy-for-multisite.sh - shell: | #!/bin/bash - echo "This is where we deploy fuel, extract passwords and save into file" + #$WORKSPACE/tools/keystone/fetchpass.sh - builder: name: 'multisite-fuel-deploy-regiontwo-virtual-builder' builders: + - shell: + !include-raw-escape: ./fuel-deploy-for-multisite.sh - shell: | #!/bin/bash echo "This is where we deploy fuel, extract publicUrl, privateUrl, and adminUrl and save into file" + #$WORKSPACE/tools/keystone/endpoint.sh - builder: name: 'multisite-register-endpoints-builder' builders: - copyartifact: project: 'multisite-fuel-deploy-regiontwo-virtual-{stream}' which-build: multijob-build - filter: "RegionTwo-Endpoints.txt" + filter: "endpoints.ini" - shell: | #!/bin/bash - echo "This is where we register RegionTwo in RegionOne keystone" + echo "This is where we register RegionTwo in RegionOne keystone using endpoints.ini" + #$WORKSPACE/tools/keystone/region.sh - builder: name: 'multisite-update-auth-builder' builders: - copyartifact: project: 'multisite-fuel-deploy-regionone-virtual-{stream}' which-build: multijob-build - filter: "RegionOne-Passwords.txt" + filter: "servicepass.ini" - shell: | #!/bin/bash - echo "This is where we read passwords from RegionOne-passwords.txt and replace passwords in RegionTwo" + echo "This is where we read passwords from servicepass.ini and replace passwords in RegionTwo" + #$WORKSPACE/tools/keystone/run.sh -t controller -r $WORKSPACE/tools/keystone/writepass.sh -d $WORKSPACE/servicepass.ini + #$WORKSPACE/tools/keystone/run.sh -t compute -r $WORKSPACE/tools/keystone/writepass.sh -d $WORKSPACE/servicepass.ini - builder: name: 'multisite-kingbird-deploy-virtual-builder' builders: @@ -211,13 +228,7 @@ #!/bin/bash echo "This is where we install kingbird" -- builder: - name: 'multisite-kingbird-functest-builder' - builders: - - shell: | - #!/bin/bash - - echo "This is where we run kingbird-functest" + #$WORKSPACE/tools/kingbird/deploy.sh ######################## # publisher macros ######################## @@ -225,7 +236,7 @@ name: 'multisite-fuel-deploy-regionone-virtual-publisher' publishers: - archive: - artifacts: '/root/servicepass.ini' + artifacts: 'servicepass.ini' allow-empty: false only-if-success: true fingerprint: true @@ -233,7 +244,7 @@ name: 'multisite-fuel-deploy-regiontwo-virtual-publisher' publishers: - archive: - artifacts: '/root/endpoints.ini' + artifacts: 'endpoints.ini' allow-empty: false only-if-success: true fingerprint: true |