Browse Source

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
tags/v19.03.06
Evgeny L 3 months ago
parent
commit
d33e89a0ef
1 changed files with 2 additions and 4 deletions
  1. 2
    4
      tools/gate/Jenkinsfile

+ 2
- 4
tools/gate/Jenkinsfile View File

@@ -33,8 +33,6 @@ IPMI_IPS = ['10.23.104.12',
33 33
             '10.23.104.17',
34 34
             '10.23.104.19']
35 35
 
36
-ARTF_PATH="cicd/${JOB_BASE_NAME}/${BUILD_NUMBER}"
37
-
38 36
 AIRSHIP_MANIFESTS_REPO = 'https://git.openstack.org/openstack/airship-treasuremap'
39 37
 DISPLAY_NAME = 'manual'
40 38
 
@@ -221,7 +219,7 @@ def shipyard_deploy = { action ->
221 219
     try {
222 220
         def req = keystone.retrieveToken(SHIPYARD_PASSWD, KEYSTONE_URL, false)
223 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 223
         shipyard2.waitAction(action, uuid, SHIPYARD_URL, SHIPYARD_PASSWD, KEYSTONE_URL, false)
226 224
 
227 225
     } catch (err) {
@@ -320,7 +318,7 @@ def sanity_tests = {
320 318
 
321 319
 //// main flow
322 320
 
323
-vm(timeout: 360) {
321
+vm(timeout: 360, publicNet: 'foundry') {
324 322
     // wait and make sure genesis is up
325 323
     ssh.wait (GENESIS_CREDS, GENESIS_IP, 'hostname')
326 324
 

Loading…
Cancel
Save