diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-05-17 15:38:07 -0700 |
|---|---|---|
| committer | Gary Wu <gary.i.wu@huawei.com> | 2018-05-17 16:01:27 -0700 |
| commit | 4e980137e1c86155522d91337fb1abafdbaa0239 (patch) | |
| tree | 65340d61f7e6a83bd4b9fca48dbf241c3de38850 | |
| parent | e2cdd5d1316d57cab6bb9564207c063eafc93c1c (diff) | |
Update deploy scripts to use new boot artifacts
Change-Id: I5662a01696fd49b659fd81b98292fc359913382b
Issue-ID: INT-504
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
| -rw-r--r-- | test/ete/labs/gwu/onap-openstack-template.env | 2 | ||||
| -rw-r--r-- | test/ete/labs/tlab/onap-openstack-template.env | 2 | ||||
| -rw-r--r-- | test/ete/labs/windriver/onap-openstack-template.env | 2 | ||||
| -rwxr-xr-x | test/ete/scripts/deploy-onap.sh | 16 |
4 files changed, 14 insertions, 8 deletions
diff --git a/test/ete/labs/gwu/onap-openstack-template.env b/test/ete/labs/gwu/onap-openstack-template.env index 16e147d20..a7c230e0e 100644 --- a/test/ete/labs/gwu/onap-openstack-template.env +++ b/test/ete/labs/gwu/onap-openstack-template.env @@ -40,7 +40,7 @@ parameters: dmaap_topic: AUTO - artifacts_version: 1.2.0-SNAPSHOT + artifacts_version: 1.2.1-SNAPSHOT openstack_tenant_id: ${OS_PROJECT_ID} diff --git a/test/ete/labs/tlab/onap-openstack-template.env b/test/ete/labs/tlab/onap-openstack-template.env index 3b702c48e..e812cac41 100644 --- a/test/ete/labs/tlab/onap-openstack-template.env +++ b/test/ete/labs/tlab/onap-openstack-template.env @@ -40,7 +40,7 @@ parameters: dmaap_topic: AUTO - artifacts_version: 1.2.0-SNAPSHOT + artifacts_version: 1.2.1-SNAPSHOT openstack_tenant_id: ${OS_PROJECT_ID} diff --git a/test/ete/labs/windriver/onap-openstack-template.env b/test/ete/labs/windriver/onap-openstack-template.env index da4b0e7e5..5dada453e 100644 --- a/test/ete/labs/windriver/onap-openstack-template.env +++ b/test/ete/labs/windriver/onap-openstack-template.env @@ -40,7 +40,7 @@ parameters: dmaap_topic: AUTO - artifacts_version: 1.2.0-SNAPSHOT + artifacts_version: 1.2.1-SNAPSHOT openstack_tenant_id: ${OS_PROJECT_ID} diff --git a/test/ete/scripts/deploy-onap.sh b/test/ete/scripts/deploy-onap.sh index b580351dd..182e398ca 100755 --- a/test/ete/scripts/deploy-onap.sh +++ b/test/ete/scripts/deploy-onap.sh @@ -1,10 +1,11 @@ #!/bin/bash -x -if [ "$#" -ne 1 ]; then - echo "Usage: $0 <lab-name>" +if [ "$#" -lt 1 ]; then + echo "Usage: $0 <lab-name> [<demo repo directory>]" exit 1 fi + if [ -z "$WORKSPACE" ]; then export WORKSPACE=`git rev-parse --show-toplevel` fi @@ -19,19 +20,24 @@ fi source $WORKSPACE/test/ete/scripts/install_openstack_cli.sh +DEMO_DIR=${ONAP_WORKDIR}/demo +if [ "$#" -ge 2 ]; then + DEMO_DIR=$2 +fi + SENTINEL='Docker versions and branches' mkdir -p ${LAB_DIR}/target YAML_FILE=${LAB_DIR}/target/onap_openstack.yaml ENV_FILE=${LAB_DIR}/target/onap_openstack.env -YAML_SRC=${ONAP_WORKDIR}/demo/heat/ONAP/onap_openstack.yaml -ENV_SRC=${ONAP_WORKDIR}/demo/heat/ONAP/onap_openstack.env +YAML_SRC=${DEMO_DIR}/heat/ONAP/onap_openstack.yaml +ENV_SRC=${DEMO_DIR}/heat/ONAP/onap_openstack.env # copy heat template to WORKSPACE cp ${YAML_SRC} ${YAML_FILE} # generate final env file -pushd ${ONAP_WORKDIR}/demo +pushd ${DEMO_DIR} envsubst < ${LAB_DIR}/onap-openstack-template.env | sed -n "1,/${SENTINEL}/p" > ${ENV_FILE} echo " # Rest of the file was AUTO-GENERATED from" | tee -a ${ENV_FILE} echo " #" $(git config --get remote.origin.url) heat/ONAP/onap_openstack.env $(git rev-parse HEAD) | tee -a ${ENV_FILE} |