summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authormbeierl <mark.beierl@dell.com>2018-02-05 09:31:21 -0500
committermbeierl <mark.beierl@dell.com>2018-02-05 09:31:21 -0500
commitce8adafbccb4bc37930f95561fa24874906013ad (patch)
tree3c8bee75f2787c95de69819243268a4163ed2cc3 /ci
parent0869c3a314d864d65b2d9faf98653378e411d493 (diff)
Updates for JOID Integration
Changes daily to use the script from JOID to fetch OS information. Adds more environment variables to the OSCreds. Change-Id: I8cc07f82d6cc1bb70987a29947cc4093e8a2ff56 JIRA: STORPERF-238 Signed-off-by: mbeierl <mark.beierl@dell.com>
Diffstat (limited to 'ci')
-rwxr-xr-xci/daily.sh2
-rwxr-xr-xci/generate-admin-rc.sh19
2 files changed, 11 insertions, 10 deletions
diff --git a/ci/daily.sh b/ci/daily.sh
index 0cafbe8..956b6e6 100755
--- a/ci/daily.sh
+++ b/ci/daily.sh
@@ -23,6 +23,8 @@ fi
rm -rf "${WORKSPACE}/ci/job/releng"
git clone --depth 1 https://gerrit.opnfv.org/gerrit/releng "${WORKSPACE}/ci/job/releng"
+rm -rf "${WORKSPACE}/ci/job/joid"
+git clone --depth 1 https://gerrit.opnfv.org/gerrit/joid "${WORKSPACE}/ci/job/joid"
virtualenv "${WORKSPACE}/ci/job/storperf_daily_venv"
# shellcheck source=/dev/null
diff --git a/ci/generate-admin-rc.sh b/ci/generate-admin-rc.sh
index 6767fab..1a7ffed 100755
--- a/ci/generate-admin-rc.sh
+++ b/ci/generate-admin-rc.sh
@@ -17,16 +17,15 @@ CA_CERT=""
INSTALLER="$(./detect_installer.sh)"
case $INSTALLER in
joid)
- OS_AUTH_URL=http://$(juju status keystone | grep public | awk '{print $2}'):5000/v2.0
- OS_USERNAME=admin
- OS_PASSWORD=openstack
- cat << EOF > job/openstack.rc
-export OS_AUTH_URL=$OS_AUTH_URL
-export OS_USERNAME=$OS_USERNAME
-export OS_PASSWORD=$OS_PASSWORD
-export OS_TENANT_NAME=admin
-export OS_PROJECT_NAME=admin
-EOF
+ CUR_DIR="$(pwd)"
+ set -x
+ export JOB_DIR="${CUR_DIR}/job"
+ sed -i '/echo_info "Creating external network with neutron"/i \
+exit 0' job/joid/ci/openstack.sh
+ sed -i "s|~/joid_config/admin-openrc|${JOB_DIR}/openstack.rc|g" job/joid/ci/openstack.sh
+ cd job/joid/ci
+ ./openstack.sh
+ cd "${CUR_DIR}"
;;
fuel)
INSTALLER_IP=$(sudo virsh net-dumpxml mcpcontrol | grep 'cfg01' | cut -d"'" -f6)