summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeny L <eli@mirantis.com>2019-02-12 17:51:01 +0000
committerKaspars Skels <kaspars.skels@gmail.com>2019-02-12 22:55:04 +0000
commitd33e89a0efb2bd56959f173fba5be2cff3d8d591 (patch)
tree63e4c62c59483fa9c8a7c4557349170a9a76230a
parent56a91502a27969b425bff25f2303d2df315b9c19 (diff)
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
Notes
Notes (review): Code-Review+2: Kaspars Skels <kaspars.skels@gmail.com> Code-Review+2: Roman Gorshunov <roman.gorshunov@att.com> Workflow+1: Roman Gorshunov <roman.gorshunov@att.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 13 Feb 2019 18:16:54 +0000 Reviewed-on: https://review.openstack.org/636402 Project: openstack/airship-treasuremap Branch: refs/heads/master
-rw-r--r--tools/gate/Jenkinsfile6
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/gate/Jenkinsfile b/tools/gate/Jenkinsfile
index fee1c03..9a01fdb 100644
--- a/tools/gate/Jenkinsfile
+++ b/tools/gate/Jenkinsfile
@@ -33,8 +33,6 @@ IPMI_IPS = ['10.23.104.12',
33 '10.23.104.17', 33 '10.23.104.17',
34 '10.23.104.19'] 34 '10.23.104.19']
35 35
36ARTF_PATH="cicd/${JOB_BASE_NAME}/${BUILD_NUMBER}"
37
38AIRSHIP_MANIFESTS_REPO = 'https://git.openstack.org/openstack/airship-treasuremap' 36AIRSHIP_MANIFESTS_REPO = 'https://git.openstack.org/openstack/airship-treasuremap'
39DISPLAY_NAME = 'manual' 37DISPLAY_NAME = 'manual'
40 38
@@ -221,7 +219,7 @@ def shipyard_deploy = { action ->
221 try { 219 try {
222 def req = keystone.retrieveToken(SHIPYARD_PASSWD, KEYSTONE_URL, false) 220 def req = keystone.retrieveToken(SHIPYARD_PASSWD, KEYSTONE_URL, false)
223 def token = req.getHeaders()["X-Subject-Token"][0] 221 def token = req.getHeaders()["X-Subject-Token"][0]
224 shipyard2.uploadConfig(uuid, token, SHIPYARD_URL, ARTF_PATH, SITE_NAME) 222 shipyard2.uploadConfig(uuid, token, SHIPYARD_URL, SITE_NAME)
225 shipyard2.waitAction(action, uuid, SHIPYARD_URL, SHIPYARD_PASSWD, KEYSTONE_URL, false) 223 shipyard2.waitAction(action, uuid, SHIPYARD_URL, SHIPYARD_PASSWD, KEYSTONE_URL, false)
226 224
227 } catch (err) { 225 } catch (err) {
@@ -320,7 +318,7 @@ def sanity_tests = {
320 318
321//// main flow 319//// main flow
322 320
323vm(timeout: 360) { 321vm(timeout: 360, publicNet: 'foundry') {
324 // wait and make sure genesis is up 322 // wait and make sure genesis is up
325 ssh.wait (GENESIS_CREDS, GENESIS_IP, 'hostname') 323 ssh.wait (GENESIS_CREDS, GENESIS_IP, 'hostname')
326 324