ubuntu-openstack-ci

Merge lp:~chris.macnaughton/ubuntu-openstack-ci/add-swift into lp:ubuntu-openstack-ci

  1. add-swift
  2. Merge into trunk
Proposed by Chris MacNaughton
Status: Merged
Merged at revision: 441
Proposed branch: lp:~chris.macnaughton/ubuntu-openstack-ci/add-swift
Merge into: lp:ubuntu-openstack-ci
Diff against target: 23 lines (+8/-0)
1 file modified
run/job-parts/osci_openstack_common.sh (+8/-0)
To merge this branch: bzr merge lp:~chris.macnaughton/ubuntu-openstack-ci/add-swift
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+391428@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Liam Young (gnuoy) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'run/job-parts/osci_openstack_common.sh'
2--- run/job-parts/osci_openstack_common.sh 2020-08-31 10:20:22 +0000
3+++ run/job-parts/osci_openstack_common.sh 2020-09-28 10:09:21 +0000
4@@ -64,6 +64,13 @@
5 echo " TEST_ARISTA_IMAGE_REMOTE: $TEST_ARISTA_IMAGE_REMOTE"
6 }
7
8+function f_env_set_swift_location() {
9+ f_line $FUNCNAME
10+ # Set Swift location if not already set
11+ [[ -z "$TEST_SWIFT_IP" ]] && export TEST_SWIFT_IP='10.245.161.162'
12+ echo " TEST_SWIFT_IP: $TEST_SWIFT_IP"
13+}
14+
15
16 function f_openstack_set_network_env_vars() {
17 f_line $FUNCNAME
18@@ -172,6 +179,7 @@
19 f_env_set_amphora_location
20 f_env_set_triliovault_license_location
21 f_env_set_arista_image_location
22+ f_env_set_swift_location
23 }
24
25

Subscribers

People subscribed via source and target branches