diff options
Diffstat (limited to 'jjb')
| -rwxr-xr-x | jjb/fuel/fuel-deploy.sh | 22 | ||||
| -rw-r--r-- | jjb/opnfv/slave-params.yml | 12 |
2 files changed, 23 insertions, 11 deletions
diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh index 2cea28b95..d797cf9f6 100755 --- a/jjb/fuel/fuel-deploy.sh +++ b/jjb/fuel/fuel-deploy.sh @@ -11,28 +11,28 @@ echo "Using $(echo $OPNFV_ARTIFACT_URL | cut -d'/' -f3) for deployment" # create TMPDIR if it doesn't exist export TMPDIR=$HOME/tmpdir -[[ -d $TMPDIR ]] || mkdir -p $TMPDIR +mkdir -p $TMPDIR # change permissions down to TMPDIR chmod a+x $HOME chmod a+x $TMPDIR # set CONFDIR, BRIDGE -CONFDIR=$WORKSPACE/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2 +POD_CONF_DIR=$WORKSPACE/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2 BRIDGE=pxebr # clone genesis repo and checkout the SR1 tag -echo "Cloning genesis repo" -cd $WORKSPACE -GIT_SSL_NO_VERIFY=true git clone https://gerrit.opnfv.org/gerrit/genesis genesis -cd genesis -git checkout arno.2015.2.0 +#echo "Cloning genesis repo" +#cd $WORKSPACE +#GIT_SSL_NO_VERIFY=true git clone https://gerrit.opnfv.org/gerrit/genesis genesis +#cd genesis +#git checkout arno.2015.2.0 # cleanup first -sudo $WORKSPACE/genesis/common/ci/clean.sh -base_config $WORKSPACE/genesis/foreman/ci/inventory/lf_pod2_ksgen_settings.yml +#sudo $WORKSPACE/genesis/common/ci/clean.sh -base_config $WORKSPACE/genesis/foreman/ci/inventory/lf_pod2_ksgen_settings.yml # prepare for Fuel Deployment -sudo $WORKSPACE/genesis/common/ci/setup.sh +#sudo $WORKSPACE/genesis/common/ci/setup.sh # log info to console echo "Starting the deployment using $INSTALLER_TYPE. This could take some time..." @@ -41,9 +41,9 @@ echo # start the deployment echo "Issuing command" -echo "sudo $WORKSPACE/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 $POD_CONF_DIR/dea.yaml -dha $POD_CONF_DIR/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 +sudo $WORKSPACE/ci/deploy.sh -iso $WORKSPACE/opnfv.iso -dea $POD_CONF_DIR/dea.yaml -dha $POD_CONF_DIR/dha.yaml -s $TMPDIR -b $BRIDGE -nh echo echo "--------------------------------------------------------" diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index aaefd337d..ddc1786cd 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -39,6 +39,10 @@ name: GIT_BASE default: ssh://gerrit.opnfv.org:29418/$PROJECT description: 'Git URL to use on this Jenkins Slave' + - string: + name: POD_CONF_DIR + default: $WORKSPACE/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2 + description: 'Directory where POD configuration files are located.' - parameter: name: 'ericsson-pod1-defaults' @@ -58,6 +62,10 @@ name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' + - string: + name: POD_CONF_DIR + default: $WORKSPACE/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/pod1 + description: 'Directory where POD configuration files are located.' - parameter: name: 'ericsson-pod2-defaults' @@ -77,6 +85,10 @@ name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' + - string: + name: POD_CONF_DIR + default: $WORKSPACE/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/pod2 + description: 'Directory where POD configuration files are located.' - parameter: name: 'intelpod2-jumphost-defaults' |