x/sahara-ci-config
Code Issues Proposed changes

Merge "Remove IDH tests"

Browse Source
This commit is contained in:
Jenkins 2014-06-16 11:59:49 +00:00 committed by Gerrit Code Review
commit 94b9bdf453
2 changed files with 0 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
slave-scripts/diskimage-creating-integration.sh
View File

@ -264,14 +264,6 @@ SKIP_SCALING_TEST = $SCALING_TEST
$HDP_PARAMS
" >> sahara/tests/integration/configs/itest.conf
echo "[IDH]
IMAGE_NAME = '$IDH_IMAGE'
IDH_REPO_URL = 'file:///var/repo/intel'
OS_REPO_URL = 'http://172.18.87.221/mirror/centos/base/'
SSH_USERNAME = 'cloud-user'
MANAGER_FLAVOR_ID = '3'
" >> sahara/tests/integration/configs/itest.conf
touch $TMP_LOG
i=0

42
slave-scripts/gate-savanna-integration-new.sh
View File

@ -29,8 +29,6 @@ TRANSIENT_TEST=True
ONLY_TRANSIENT_TEST=False
HDP1_IMAGE=savanna-itests-ci-hdp-image-jdk-iptables-off
HDP2_IMAGE=centos-6_4-64-hdp-2-0-hw
IDH2_IMAGE=intel-noepel
IDH3_IMAGE=centos-idh-3.0.2
VANILLA_IMAGE=savanna-itests-ci-vanilla-image
HEAT_JOB=False
@ -69,16 +67,6 @@ then
VANILLA_TWO_IMAGE=ubuntu-vanilla-2.3-latest
echo "Vanilla2 detected"
fi
if [ $JOB_TYPE == 'idh2' ]
then
IDH2_JOB=True
echo "IDH2 detected"
fi
if [ $JOB_TYPE == 'idh3' ]
then
IDH3_JOB=True
echo "IDH3 detected"
fi
if [ $JOB_TYPE == 'transient' ]
then
EDP_TEST=False
@ -250,24 +238,6 @@ IMAGE_NAME = '$HDP2_IMAGE'
SKIP_ALL_TESTS_FOR_PLUGIN = False
" >> $WORKSPACE/sahara/tests/integration/configs/itest.conf
echo "[IDH2]
IMAGE_NAME = '$IDH2_IMAGE'
IDH_REPO_URL = 'file:///var/repo/intel'
OS_REPO_URL = 'http://172.18.87.221/mirror/centos/base/'
SSH_USERNAME = 'cloud-user'
MANAGER_FLAVOR_ID = '3'
" >> $WORKSPACE/sahara/tests/integration/configs/itest.conf
echo "[IDH3]
IMAGE_NAME = '$IDH3_IMAGE'
IDH_REPO_URL = 'file:///var/repo/intel'
OS_REPO_URL = 'http://172.18.87.221/mirror/centos/base/'
SSH_USERNAME = 'cloud-user'
MANAGER_FLAVOR_ID = '3'
SKIP_SWIFT_TEST = $SWIFT_TEST
SKIP_SCALING_TEST = True
" >> $WORKSPACE/sahara/tests/integration/configs/itest.conf
touch $TMP_LOG
i=0
@ -323,18 +293,6 @@ if [ "$FAILURE" = 0 ]; then
STATUS=`echo $?`
fi
if [ $IDH2_JOB ]
then
tox -e integration -- idh2 --concurrency=1
STATUS=`echo $?`
fi
if [ $IDH3_JOB ]
then
tox -e integration -- idh3 --concurrency=1
STATUS=`echo $?`
fi
if [ $TRANSIENT_JOB ]
then
tox -e integration -- transient --concurrency=1