diff options
| author |   Aric Gardner <agardner@linuxfoundation.org> | 2015-08-13 20:13:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-08-13 20:13:09 +0000 |
| commit | 47457ebd095482f17a7affa4d3ac98b005644760 (patch) | |
| tree | b705841063a502ed3309b4ea8fdaf3f41528c60f | |
| parent | 8946d3e2d2c3b9445cfdd9da065c68e20515852d (diff) | |
| parent | f5d33209e67bbbaea863dd2b5b647ce48a7534df (diff) | |
Merge "Fixes jjb to use common clean and fuel config files"
| -rw-r--r-- | jjb/genesis/genesis-foreman.yml | 2 | ||||
| -rw-r--r-- | jjb/genesis/genesis-fuel.yml | 20 |
2 files changed, 16 insertions, 6 deletions
diff --git a/jjb/genesis/genesis-foreman.yml b/jjb/genesis/genesis-foreman.yml index 3bc6b125a..e4c6081c5 100644 --- a/jjb/genesis/genesis-foreman.yml +++ b/jjb/genesis/genesis-foreman.yml @@ -469,7 +469,7 @@ echo # cleanup first - sudo $WORKSPACE/$INSTALLER/ci/clean.sh -base_config $WORKSPACE/$INSTALLER/ci/inventory/lf_pod2_ksgen_settings.yml + sudo $WORKSPACE/common/ci/clean.sh -base_config $WORKSPACE/$INSTALLER/ci/inventory/lf_pod2_ksgen_settings.yml # and then initiate deployment sudo $WORKSPACE/$INSTALLER/ci/deploy.sh -base_config $WORKSPACE/$INSTALLER/ci/inventory/lf_pod2_ksgen_settings.yml diff --git a/jjb/genesis/genesis-fuel.yml b/jjb/genesis/genesis-fuel.yml index c8675907c..7c5c55b1d 100644 --- a/jjb/genesis/genesis-fuel.yml +++ b/jjb/genesis/genesis-fuel.yml @@ -438,8 +438,12 @@ chmod a+x $HOME chmod a+x $TMPDIR - # set TOPDIR + # set TOPDIR, CONFDIR export TOPDIR=$WORKSPACE/fuel/prototypes/auto-deploy + export CONFDIR=$WORKSPACE/fuel/deploy/baremetal/conf/linux_foundation_lab/pod2/multinode + + # cleanup first + sudo $WORKSPACE/common/ci/clean.sh -base_config $WORKSPACE/foreman/ci/inventory/lf_pod2_ksgen_settings.yml # log info to console echo "Starting the deployment using $INSTALLER. This could take some time..." @@ -448,8 +452,8 @@ # start the deployment echo "Issuing command" - echo "sudo TMPDIR=${TMPDIR} ${TOPDIR}/deploy/deploy.sh ${WORKSPACE}/opnfv.iso ${TOPDIR}/configs/lf_pod1/dea_no-ha.yaml ${TOPDIR}/configs/lf_pod1/dha.yaml" - sudo TMPDIR=${TMPDIR} ${TOPDIR}/deploy/deploy.sh ${WORKSPACE}/opnfv.iso ${TOPDIR}/configs/lf_pod1/dea_no-ha.yaml ${TOPDIR}/configs/lf_pod1/dha.yaml + echo "sudo TMPDIR=${TMPDIR} ${TOPDIR}/deploy/deploy.sh ${WORKSPACE}/opnfv.iso ${CONFDIR}/dea.yaml ${CONFDIR}/dha.yaml" + sudo TMPDIR=${TMPDIR} ${TOPDIR}/deploy/deploy.sh ${WORKSPACE}/opnfv.iso ${CONFDIR}/dea.yaml ${CONFDIR}/dha.yaml echo echo "--------------------------------------------------------" @@ -478,6 +482,12 @@ chmod a+x $HOME chmod a+x $TMPDIR + # set CONFDIR + export CONFDIR=$WORKSPACE/fuel/deploy/baremetal/conf/linux_foundation_lab/pod2/ha + + # cleanup first + sudo $WORKSPACE/common/ci/clean.sh -base_config $WORKSPACE/foreman/ci/inventory/lf_pod2_ksgen_settings.yml + # log info to console echo "Starting the deployment using $INSTALLER. This could take some time..." echo "--------------------------------------------------------" @@ -485,9 +495,9 @@ # start the deployment echo "Issuing command" - echo "sudo $WORKSPACE/fuel/ci/deploy.sh $WORKSPACE/opnfv.iso $WORKSPACE/fuel/deploy/baremetal/conf/linux_foundation_lab/ha/dea.yaml $WORKSPACE/fuel/deploy/baremetal/conf/linux_foundation_lab/ha/dha.yaml -s $TMPDIR" + echo "sudo $WORKSPACE/fuel/ci/deploy.sh $WORKSPACE/opnfv.iso ${CONFDIR}/dea.yaml ${CONFDIR}/dha.yaml -s $TMPDIR" - sudo $WORKSPACE/fuel/ci/deploy.sh $WORKSPACE/opnfv.iso $WORKSPACE/fuel/deploy/baremetal/conf/linux_foundation_lab/ha/dea.yaml $WORKSPACE/fuel/deploy/baremetal/conf/linux_foundation_lab/ha/dha.yaml -s $TMPDIR + sudo $WORKSPACE/fuel/ci/deploy.sh $WORKSPACE/opnfv.iso ${CONFDIR}/dea.yaml ${CONFDIR}/dha.yaml -s $TMPDIR echo echo "--------------------------------------------------------" echo "Done!" |