Skip to content
This repository was archived by the owner on Oct 28, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions resources/JenkinsfileTemplate.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ def testUnix(){
dir("${BASE_DIR}"){
// Ephemeral workers don't have a HOME env variable.
withEnv(["HOME=${env.WORKSPACE}"]){
sh returnStatus: true, script: './resources/scripts/jenkins/test.sh'
sh returnStatus: true, script: './resources/scripts/jenkins/apm-ci/test.sh'
}
}
}
Expand All @@ -387,15 +387,15 @@ def testBaremetal(){
deleteDir()
unstash 'source'
dir("${BASE_DIR}"){
sh returnStatus: true, script: './resources/scripts/jenkins/test-baremetal.sh'
sh returnStatus: true, script: './resources/scripts/jenkins/apm-ci/test-baremetal.sh'
}
}

def testMac(){
deleteDir()
unstash 'source'
dir("${BASE_DIR}"){
sh returnStatus: true, script: './resources/scripts/jenkins/test-mac.sh'
sh returnStatus: true, script: './resources/scripts/jenkins/apm-ci/test-mac.sh'
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ set -x

## Run test-infra and trap error to notify when required
{ py.test -v \
test-infra/test_installed_tools.py \
test-infra/apm-ci/test_installed_tools.py \
--junit-xml=target/junit-test-infra.xml; \
err="$?"; } || true

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ set -x

## Run test-infra and trap error to notify when required
{ py.test -v \
test-infra/test_installed_tools.py \
test-infra/test_installed_tools_docker.py \
test-infra/apm-ci/test_installed_tools.py \
test-infra/apm-ci/test_installed_tools_docker.py \
--junit-xml=target/junit-test-infra.xml; \
err="$?"; } || true

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ set -x

## Run test-infra and trap error to notify when required
{ py.test -v \
test-infra/test_installed_tools.py \
test-infra/test_installed_tools_docker.py \
test-infra/test_installed_tools_extra.py \
test-infra/test_packer.py \
test-infra/apm-ci/test_installed_tools.py \
test-infra/apm-ci/test_installed_tools_docker.py \
test-infra/apm-ci/test_installed_tools_extra.py \
test-infra/apm-ci/test_packer.py \
--junit-xml=target/junit-test-infra.xml; \
err="$?"; } || true

Expand Down