composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

!y# This is a combination of 4 commits.

Browse Source 
run OQL tests depending on jenkins param

try sth

try sth

try sth

try sth

try sth

fix parameter to run OQL tests or not

run OQL tests depending on jenkins param

try sth

try sth

try sth

try sth

try sth

fix parameter to run OQL tests or not
This commit is contained in:
odain
2019-12-03 09:59:37 +01:00
parent 28818010d6
commit ed81391aff
4 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.jenkins/bin/init/debug.sh
View File

@@ -2,6 +2,8 @@
set -x
whoami
pwd
ls

14
.jenkins/bin/tests/phpunit.sh
View File

@@ -6,14 +6,16 @@ cd test
export DEBUG_UNIT_TEST=0
RUN_NONREG_TESTS=0
if [ $# -ge 1 ]
if [ $# -ge 1 -a "x$1" == "xtrue" ]
then
export DEBUG_UNIT_TEST=$1
export DEBUG_UNIT_TEST=1
else
export DEBUG_UNIT_TEST=0
fi
if [ $# -ge 2 ]
if [ $# -ge 2 -a "x$2" == "xtrue" ]
then
RUN_NONREG_TESTS=$2
echo php vendor/bin/phpunit --log-junit ../var/test/phpunit-log.junit.xml --teamcity
else
echo php vendor/bin/phpunit --log-junit ../var/test/phpunit-log.junit.xml --exclude-group OQL --teamcity
fi
#php vendor/bin/phpunit --log-junit ../var/test/phpunit-log.junit.xml --teamcity

6
Jenkinsfile vendored
View File

@@ -1,8 +1,8 @@
pipeline {
agent any
parameters {
string(name: 'DEBUG_UNIT_TEST', defaultValue: '0', description: 'Debug mode?')
string(name: 'RUN_NON_REG_TESTS', defaultValue: '0', description: 'Do You want to run legacy OQL regression tests?')
booleanParam(name: 'debugMode', defaultValue: 'false', description: 'Debug mode?')
booleanParam(name: 'runNonRegOQLTests', defaultValue: 'false', description: 'Do You want to run legacy OQL regression tests?')
}
stages {
@@ -40,7 +40,7 @@ pipeline {
parallel {
stage('phpunit') {
steps {
sh './.jenkins/bin/tests/phpunit.sh ${params.DEBUG_UNIT_TEST} ${params.RUN_NON_REG_TESTS}'
sh './.jenkins/bin/tests/phpunit.sh ${debugMode} ${runNonRegOQLTests}'
}
}
}

3
test/phpunit.xml.dist
View File

@@ -53,6 +53,9 @@
<testsuite name="Application">
<directory>application</directory>
</testsuite>
<testsuite name="OQL">
<directory>OQL</directory>
</testsuite>
<testsuite name="Status">
<directory>status</directory>
</testsuite>