diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-07-19 16:34:55 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2018-07-19 16:34:55 -0400 |
| commit | 0af8cbde5adf37aaa481bf826afd7069893d99f3 (patch) | |
| tree | 67e345601ce95d228bc61f132d1f2d2df9480278 /jjb/apex/apex-deploy.sh | |
| parent | a1be8f9e82281c439d689292259a4f2005a5f4a2 (diff) | |
Apex: More snapshot fixes
Changes-Include:
- Use correct csit env file with promote jobs
- Ensure odl container starts when snapshots brought up
- Use SDN_CONTROLLER_PASSWORD for ODL pass rather than
hardcoding admin
Change-Id: I910a4eefa2b4c621e3f82939bedee338fad91bf3
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'jjb/apex/apex-deploy.sh')
| -rwxr-xr-x | jjb/apex/apex-deploy.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh index f5c6ab108..52b8a4cda 100755 --- a/jjb/apex/apex-deploy.sh +++ b/jjb/apex/apex-deploy.sh @@ -119,7 +119,12 @@ if [[ "$JOB_NAME" =~ "virtual" ]]; then DEPLOY_CMD="${DEPLOY_CMD} --virtual-default-ram 12 --virtual-compute-ram 7" fi if [[ "$PROMOTE" == "True" ]]; then - DEPLOY_CMD="${DEPLOY_CMD} --virtual-computes 2 -e csit-environment.yaml" + if [[ "$JOB_NAME" =~ "queens" ]]; then + CSIT_ENV="csit-queens-environment.yaml" + else + CSIT_ENV="csit-environment.yaml" + fi + DEPLOY_CMD="${DEPLOY_CMD} --virtual-computes 2 -e ${CSIT_ENV}" fi else # settings for bare metal deployment |