diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2017-01-30 11:42:54 +0100 |
|---|---|---|
| committer | Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2017-01-30 13:31:03 +0100 |
| commit | ea7a78ff00e310bf709ac0e2853cd1aa415b23bd (patch) | |
| tree | 102c619f4a471ccb4c0b9578d86be870ff7f8f3a | |
| parent | c534366b1df57f65ef9aee361b048123ab4ee0e5 (diff) | |
multisite: Fix job parameters and align jobs with the scripts
Change-Id: I40c1dc3662904e054b5c6ad6786f829ecb08ee6e
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
| -rw-r--r-- | jjb/multisite/multisite-daily-jobs.yml | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/jjb/multisite/multisite-daily-jobs.yml b/jjb/multisite/multisite-daily-jobs.yml index e0dfbfa7e..15c885de4 100644 --- a/jjb/multisite/multisite-daily-jobs.yml +++ b/jjb/multisite/multisite-daily-jobs.yml @@ -96,6 +96,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 @@ -107,6 +108,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 @@ -122,6 +124,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 @@ -139,6 +142,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 @@ -160,7 +164,15 @@ - string: name: KINGBIRD_LOG_FILE default: $WORKSPACE/kingbird.log + - gerrit-parameter: + branch: '{branch}' + - 'fuel-defaults' - '{slave-label}-defaults' + - choice: + name: FRESH_INSTALL + choices: + - 'true' + - 'false' scm: - git-scm @@ -185,7 +197,8 @@ - shell: | #!/bin/bash echo "This is where we deploy fuel, extract passwords and save into file" - #$WORKSPACE/tools/keystone/fetchpass.sh + $WORKSPACE/tools/keystone/run.sh -t controller -r $WORKSPACE/tools/keystone/fetchpass.sh -o servicepass.ini + - builder: name: 'multisite-fuel-deploy-regiontwo-virtual-builder' builders: @@ -195,7 +208,7 @@ #!/bin/bash echo "This is where we deploy fuel, extract publicUrl, privateUrl, and adminUrl and save into file" - #$WORKSPACE/tools/keystone/endpoint.sh + $WORKSPACE/tools/keystone/run.sh -t controller -r $WORKSPACE/tools/keystone/endpoint.sh -o endpoints.ini - builder: name: 'multisite-register-endpoints-builder' builders: @@ -207,7 +220,7 @@ #!/bin/bash echo "This is where we register RegionTwo in RegionOne keystone using endpoints.ini" - #$WORKSPACE/tools/keystone/region.sh + $WORKSPACE/tools/keystone/run.sh -t controller -r $WORKSPACE/tools/keystone/region.sh -d $WORKSPACE/endpoints.ini - builder: name: 'multisite-update-auth-builder' builders: @@ -219,8 +232,8 @@ #!/bin/bash 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 + $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: @@ -228,7 +241,7 @@ #!/bin/bash echo "This is where we install kingbird" - #$WORKSPACE/tools/kingbird/deploy.sh + $WORKSPACE/tools/kingbird/deploy.sh ######################## # publisher macros ######################## |