Merge lp:~james-page/ubuntu-openstack-ci/trilio-wlm-license into lp:ubuntu-openstack-ci

Proposed by James Page
Status: Merged
Merged at revision: 429
Proposed branch: lp:~james-page/ubuntu-openstack-ci/trilio-wlm-license
Merge into: lp:ubuntu-openstack-ci
Diff against target: 28 lines (+13/-0)
1 file modified
run/job-parts/osci_openstack_common.sh (+13/-0)
To merge this branch: bzr merge lp:~james-page/ubuntu-openstack-ci/trilio-wlm-license
Reviewer Review Type Date Requested Status
Chris MacNaughton (community) Approve
Review via email: mp+382746@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Chris MacNaughton (chris.macnaughton) wrote :

Looks good to me!

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-01-29 15:49:09 +0000
3+++ run/job-parts/osci_openstack_common.sh 2020-04-22 11:11:52 +0000
4@@ -45,6 +45,18 @@
5 }
6
7
8+function f_env_set_triliovault_license_location() {
9+ f_line $FUNCNAME
10+ # Set TrilioVault License location if not already set
11+ [[ -z "$TEST_TRILIO_LICENSE" ]] && {
12+ export TEST_TRILIO_LICENSE=$(mktemp /tmp/tvault-license.XXXXXX)
13+ # NOTE: license does expire so will need periodic renewal but this does limit misuse exposure
14+ wget -O $TEST_TRILIO_LICENSE http://10.245.161.162/swift/v1/licenses/Canonical_Engineering_NFR_100_nodes_12312022.lic
15+ }
16+ echo " TEST_TRILIO_LICENSE: $TEST_TRILIO_LICENSE"
17+}
18+
19+
20 function f_openstack_set_network_env_vars() {
21 f_line $FUNCNAME
22 f_activate_clients
23@@ -150,6 +162,7 @@
24 f_env_set_mojo_env_vars
25 f_env_set_ldap_location
26 f_env_set_amphora_location
27+ f_env_set_triliovault_license_location
28 }
29
30

Subscribers

People subscribed via source and target branches