diff options
| author |   Markos Chandras <mchandras@suse.de> | 2018-03-16 11:05:56 +0000 |
|---|---|---|
| committer | Markos Chandras <mchandras@suse.de> | 2018-03-16 22:52:35 +0000 |
| commit | cf894cbcffe0e1b2b28f6743e41407522cf20a63 (patch) | |
| tree | 7f01785f8ea5098383b87fbc19c71bda0cb770f6 /xci/playbooks/roles | |
| parent | 5dcc328f7506166e049c0310d5d8f70fa4579d45 (diff) | |
xci: Copy XCI environment to deployment hosts
The XCI hosts may need some of the XCI env variables to perform
certain tasks so dump the XCI environment to /root/xci.env file and
make that available to every host on the deployment.
Change-Id: I286a01ca7da8ff206438c261798167f5e4daf7f2
Signed-off-by: Markos Chandras <mchandras@suse.de>
Diffstat (limited to 'xci/playbooks/roles')
| -rw-r--r-- | xci/playbooks/roles/prepare-functest/templates/env.j2 | 2 | ||||
| -rw-r--r-- | xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2 | 16 |
2 files changed, 16 insertions, 2 deletions
diff --git a/xci/playbooks/roles/prepare-functest/templates/env.j2 b/xci/playbooks/roles/prepare-functest/templates/env.j2 index 43a581bd..af271ac7 100644 --- a/xci/playbooks/roles/prepare-functest/templates/env.j2 +++ b/xci/playbooks/roles/prepare-functest/templates/env.j2 @@ -1,7 +1,5 @@ -INSTALLER_TYPE=osa INSTALLER_IP=192.168.122.2 EXTERNAL_NETWORK={{ external_network }} -DEPLOY_SCENARIO="os-nosdn-nofeature-noha" CI_LOOP=daily TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results ENERGY_RECORDER_API_URL=http://energy.opnfv.fr/resources diff --git a/xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2 b/xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2 index c0b9bc88..81a0734f 100644 --- a/xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2 +++ b/xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2 @@ -1,5 +1,8 @@ #!/bin/bash +# Variables that we need to pass from XCI to functest +XCI_ENV=(INSTALLER_TYPE DEPLOY_SCENARIO XCI_FLAVOR) + source /root/openrc openstack --insecure network create --external \ @@ -14,6 +17,19 @@ openstack --insecure subnet create --network {{ external_network }} \ mkdir ~/results/ mkdir ~/images && cd ~/images && wget -q http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img && cd ~ +# Extract variables from xci.env file +if [[ -e /root/xci.env ]]; then + for x in ${XCI_ENV[@]}; do + grep "^${x}=" /root/xci.env >> /root/env + done +fi + +# Dump the env file +echo "------------------------------------------------------" +echo "------------- functest environment file --------------" +cat /root/env +echo "------------------------------------------------------" + sudo docker run --env-file env \ -v $(pwd)/openrc:/home/opnfv/functest/conf/env_file \ -v $(pwd)/images:/home/opnfv/functest/images \ |