airship
/
treasuremap
Code Issues Proposed changes

Configure public network in Jenkinsfile 

Depends-on: https://review.gerrithub.io/c/att-comdev/cicd/+/444270
Depends-on: https://review.gerrithub.io/c/att-comdev/cicd/+/438701/4
Change-Id: Iafdb301d7cbb1e63c75a01962a28bd59944e5d36
changes/02/636402/3
Evgeny L 2019-02-12 17:51:01 +00:00 committed by Kaspars Skels
parent 56a91502a2
commit d33e89a0ef
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/gate/Jenkinsfile vendored
View File

@ -33,8 +33,6 @@ IPMI_IPS = ['10.23.104.12',
'10.23.104.17',
'10.23.104.19']
ARTF_PATH="cicd/${JOB_BASE_NAME}/${BUILD_NUMBER}"
AIRSHIP_MANIFESTS_REPO = 'https://git.openstack.org/openstack/airship-treasuremap'
DISPLAY_NAME = 'manual'
@ -221,7 +219,7 @@ def shipyard_deploy = { action ->
try {
def req = keystone.retrieveToken(SHIPYARD_PASSWD, KEYSTONE_URL, false)
def token = req.getHeaders()["X-Subject-Token"][0]
shipyard2.uploadConfig(uuid, token, SHIPYARD_URL, ARTF_PATH, SITE_NAME)
shipyard2.uploadConfig(uuid, token, SHIPYARD_URL, SITE_NAME)
shipyard2.waitAction(action, uuid, SHIPYARD_URL, SHIPYARD_PASSWD, KEYSTONE_URL, false)
} catch (err) {
@ -320,7 +318,7 @@ def sanity_tests = {
//// main flow
vm(timeout: 360) {
vm(timeout: 360, publicNet: 'foundry') {
// wait and make sure genesis is up
ssh.wait (GENESIS_CREDS, GENESIS_IP, 'hostname')