ubuntu-openstack-ci

Merge lp:~1chb1n/ubuntu-openstack-ci/functest-amphora into lp:ubuntu-openstack-ci

  1. functest-amphora
  2. Merge into trunk
Proposed by Ryan Beisner
Status: Merged
Merged at revision: 408
Proposed branch: lp:~1chb1n/ubuntu-openstack-ci/functest-amphora
Merge into: lp:ubuntu-openstack-ci
Diff against target: 24 lines (+9/-0)
1 file modified
run/job-parts/osci_openstack_common.sh (+9/-0)
To merge this branch: bzr merge lp:~1chb1n/ubuntu-openstack-ci/functest-amphora
Reviewer Review Type Date Requested Status
Frode Nordahl Approve
Review via email: mp+359930@code.launchpad.net
To post a comment you must log in.
lp:~1chb1n/ubuntu-openstack-ci/functest-amphora updated
409. By Ryan Beisner

Update functest name

Revision history for this message
Frode Nordahl (fnordahl) wrote :

LGTM, thanks!

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 2018-09-17 15:25:56 +0000
3+++ run/job-parts/osci_openstack_common.sh 2018-11-30 14:54:14 +0000
4@@ -215,6 +215,14 @@
5 }
6
7
8+function f_functest_set_amphora_location() {
9+ f_line $FUNCNAME
10+ # Set Octavia amphora test image location if not already set.
11+ [[ -z "$FUNCTEST_AMPHORA_LOCATION" ]] && export FUNCTEST_AMPHORA_LOCATION='http://10.245.161.162/swift/v1/images/test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2'
12+ echo " FUNCTEST_AMPHORA_LOCATION: $FUNCTEST_AMPHORA_LOCATION"
13+}
14+
15+
16 function f_openstack_set_network_env_vars() {
17 f_line $FUNCNAME
18 f_activate_clients
19@@ -288,6 +296,7 @@
20 f_amulet_set_odl_location
21 f_amulet_to_mojo_env_vars
22 f_amulet_set_ldap_location
23+ f_functest_set_amphora_location
24 }
25
26

Subscribers

People subscribed via source and target branches