diff options
| author |   Alex Yang <yangyang1@zte.com.cn> | 2017-12-18 10:42:33 +0800 |
|---|---|---|
| committer | Alex Yang <yangyang1@zte.com.cn> | 2018-01-03 15:35:06 +0800 |
| commit | 21d75f46178aed7c9178b25ec46bcdedba441ab0 (patch) | |
| tree | a2e224aaacc3cf52ad2aa95ae28dc6b16f61f218 /jjb/daisy4nfv | |
| parent | 441f29550fbd4c5b0d48f9a28e9164b7daa414d1 (diff) | |
Use pharos repo in daisy master branch
There are no PDFs in euphrates branch of pharos repo.
Securedlab is still used in euphrates branch. In master branch,
pharos repo will be used.
Change-Id: Ifbdeed26f938025aae56d2d263abf3d8620b31ba
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
Diffstat (limited to 'jjb/daisy4nfv')
| -rwxr-xr-x | jjb/daisy4nfv/daisy-deploy.sh | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/jjb/daisy4nfv/daisy-deploy.sh b/jjb/daisy4nfv/daisy-deploy.sh index 803ff5b03..1723fd109 100755 --- a/jjb/daisy4nfv/daisy-deploy.sh +++ b/jjb/daisy4nfv/daisy-deploy.sh @@ -19,14 +19,22 @@ fi # clone the securedlab repo cd $WORKSPACE -SECURELAB_DIR=/var/tmp/opnfv-securedlab -echo "Cloning securedlab repo $BRANCH to $SECURELAB_DIR" -rm -rf $SECURELAB_DIR -git clone ssh://jenkins-zte@gerrit.opnfv.org:29418/securedlab --quiet \ - --branch $BRANCH $SECURELAB_DIR +# There are no PDFs in euphrates branch of pharos repo. +if [[ "$BRANCH" =~ "euphrates" ]]; then + CONFIG_REPO_NAME=securedlab +else + CONFIG_REPO_NAME=pharos +fi + +LABS_DIR=/var/tmp/opnfv-${CONFIG_REPO_NAME} + +echo "Cloning ${CONFIG_REPO_NAME} repo $BRANCH to $LABS_DIR" +rm -rf $LABS_DIR +git clone ssh://jenkins-zte@gerrit.opnfv.org:29418/${CONFIG_REPO_NAME} \ + --quiet --branch $BRANCH $LABS_DIR -DEPLOY_COMMAND="sudo -E ./ci/deploy/deploy.sh -L $SECURELAB_DIR \ +DEPLOY_COMMAND="sudo -E ./ci/deploy/deploy.sh -L $LABS_DIR \ -l $LAB_NAME -p $POD_NAME -B $BRIDGE -s $DEPLOY_SCENARIO" # log info to console |