diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2015-11-25 16:42:10 +0100 |
|---|---|---|
| committer | Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2015-11-25 16:42:10 +0100 |
| commit | 4cb2f7999b7d6bb42443cf32b514f18fc7b579cf (patch) | |
| tree | 256f23874a21ca58de34e0b9a06f4f8a0c6612ee /jjb | |
| parent | 3510675a534afdb6e167607b544fb0e1bc7400d9 (diff) | |
Adjust fuel ci scripts/jenkins jobs for new directory structure
Change-Id: I67e081215b89e0bbcc67f0abba9eb511c64299ae
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Diffstat (limited to 'jjb')
| -rwxr-xr-x | jjb/fuel/fuel-build.sh | 2 | ||||
| -rwxr-xr-x | jjb/fuel/fuel-deploy-virtual.sh | 6 | ||||
| -rwxr-xr-x | jjb/fuel/fuel-deploy.sh | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/jjb/fuel/fuel-build.sh b/jjb/fuel/fuel-build.sh index cffd8673b..51c2a7402 100755 --- a/jjb/fuel/fuel-build.sh +++ b/jjb/fuel/fuel-build.sh @@ -20,7 +20,7 @@ else fi # start the build -cd $WORKSPACE/$INSTALLER/ci +cd $WORKSPACE/ci ./build.sh -v $OPNFV_ARTIFACT_VERSION -c file://$CACHE_DIRECTORY $BUILD_DIRECTORY # list the build artifacts diff --git a/jjb/fuel/fuel-deploy-virtual.sh b/jjb/fuel/fuel-deploy-virtual.sh index ff4f8c3f7..a65395b07 100755 --- a/jjb/fuel/fuel-deploy-virtual.sh +++ b/jjb/fuel/fuel-deploy-virtual.sh @@ -18,7 +18,7 @@ chmod a+x $HOME chmod a+x $TMPDIR # set CONFDIR, BRIDGE -CONFDIR=$WORKSPACE/fuel/deploy/templates/virtual_environment/conf +CONFDIR=$WORKSPACE/deploy/templates/virtual_environment/conf BRIDGE=pxebr # log info to console @@ -28,9 +28,9 @@ echo # start the deployment echo "Issuing command" -echo "sudo $WORKSPACE/fuel/ci/deploy.sh -iso $WORKSPACE/opnfv.iso -dea $CONFDIR/dea.yaml -dha $CONFDIR/dha.yaml -s $TMPDIR -b $BRIDGE -nh" +echo "sudo $WORKSPACE/ci/deploy.sh -iso $WORKSPACE/opnfv.iso -dea $CONFDIR/dea.yaml -dha $CONFDIR/dha.yaml -s $TMPDIR -b $BRIDGE -nh" -sudo $WORKSPACE/fuel/ci/deploy.sh -iso $WORKSPACE/opnfv.iso -dea $CONFDIR/dea.yaml -dha $CONFDIR/dha.yaml -s $TMPDIR -b $BRIDGE -nh +sudo $WORKSPACE/ci/deploy.sh -iso $WORKSPACE/opnfv.iso -dea $CONFDIR/dea.yaml -dha $CONFDIR/dha.yaml -s $TMPDIR -b $BRIDGE -nh echo echo "--------------------------------------------------------" diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh index 2ec519597..b617bcf01 100755 --- a/jjb/fuel/fuel-deploy.sh +++ b/jjb/fuel/fuel-deploy.sh @@ -18,7 +18,7 @@ chmod a+x $HOME chmod a+x $TMPDIR # set CONFDIR, BRIDGE -CONFDIR=$WORKSPACE/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2 +CONFDIR=$WORKSPACE/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2 BRIDGE=pxebr # clone genesis repo and checkout the SR1 tag @@ -41,9 +41,9 @@ echo # start the deployment echo "Issuing command" -echo "sudo $WORKSPACE/fuel/ci/deploy.sh -iso $WORKSPACE/opnfv.iso -dea $CONFDIR/dea.yaml -dha $CONFDIR/dha.yaml -s $TMPDIR -b $BRIDGE -nh" +echo "sudo $WORKSPACE/ci/deploy.sh -iso $WORKSPACE/opnfv.iso -dea $CONFDIR/dea.yaml -dha $CONFDIR/dha.yaml -s $TMPDIR -b $BRIDGE -nh" -sudo $WORKSPACE/fuel/ci/deploy.sh -iso $WORKSPACE/opnfv.iso -dea $CONFDIR/dea.yaml -dha $CONFDIR/dha.yaml -s $TMPDIR -b $BRIDGE -nh +sudo $WORKSPACE/ci/deploy.sh -iso $WORKSPACE/opnfv.iso -dea $CONFDIR/dea.yaml -dha $CONFDIR/dha.yaml -s $TMPDIR -b $BRIDGE -nh echo echo "--------------------------------------------------------" |