summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2015-08-13 10:54:05 -0400
committerTim Rozet <trozet@redhat.com>2015-08-13 10:54:05 -0400
commitf5d33209e67bbbaea863dd2b5b647ce48a7534df (patch)
treea45ccf693959082dfce69a39e8cc50c73a419d88
parentc0cc849dc17f42a3a13b6774c479dd532a8eda5b (diff)
Fixes jjb to use common clean and fuel config files
Fuel and Foreman now both use common clean. Also updates fuel to use pod2 yaml config files for arno and master deployments. JIRA: OCTO-109 Change-Id: I140fa69ed54aa12d07d9ddafc530432b3be89637 Signed-off-by: Tim Rozet <trozet@redhat.com>
-rw-r--r--jjb/genesis/genesis-foreman.yml2
-rw-r--r--jjb/genesis/genesis-fuel.yml20
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 51c66fc54..fb7a76afe 100644
--- a/jjb/genesis/genesis-fuel.yml
+++ b/jjb/genesis/genesis-fuel.yml
@@ -444,8 +444,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..."
@@ -454,8 +458,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 "--------------------------------------------------------"
@@ -484,6 +488,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 "--------------------------------------------------------"
@@ -491,9 +501,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!"