diff --git a/Jenkinsfile b/Jenkinsfile index 9005f6855..da1c4a420 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,8 +33,8 @@ pipeline { docker.withRegistry('', 'hub.docker.com-springbuildmaster') { docker.image('adoptopenjdk/openjdk8:latest').inside('-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home') { sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}" - sh "PROFILE=ci,all-dbs ./test.sh" - sh "./clean.sh" + sh "PROFILE=ci,all-dbs ci/test.sh" + sh "ci/clean.sh" } } } @@ -64,8 +64,8 @@ pipeline { docker.withRegistry('', 'hub.docker.com-springbuildmaster') { docker.image('adoptopenjdk/openjdk11:latest').inside('-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home') { sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}" - sh "PROFILE=ci,java11 ./test.sh" - sh "./clean.sh" + sh "PROFILE=ci,java11 ci/test.sh" + sh "ci/clean.sh" } } } @@ -87,8 +87,8 @@ pipeline { docker.withRegistry('', 'hub.docker.com-springbuildmaster') { docker.image('adoptopenjdk/openjdk15:latest').inside('-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home') { sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}" - sh "PROFILE=ci,java11 ./test.sh" - sh "./clean.sh" + sh "PROFILE=ci,java11 ci/test.sh" + sh "ci/clean.sh" } } } diff --git a/accept-third-party-license.sh b/ci/accept-third-party-license.sh similarity index 100% rename from accept-third-party-license.sh rename to ci/accept-third-party-license.sh diff --git a/clean.sh b/ci/clean.sh similarity index 100% rename from clean.sh rename to ci/clean.sh diff --git a/ci/run-tests-against-all-dbs.sh b/ci/run-tests-against-all-dbs.sh new file mode 100755 index 000000000..0746d338b --- /dev/null +++ b/ci/run-tests-against-all-dbs.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +./mvnw clean install -Pall-dbs diff --git a/test.sh b/ci/test.sh similarity index 89% rename from test.sh rename to ci/test.sh index 7116bb009..cc38e4965 100755 --- a/test.sh +++ b/ci/test.sh @@ -2,7 +2,7 @@ set -euo pipefail -./accept-third-party-license.sh +ci/accept-third-party-license.sh mkdir -p /tmp/jenkins-home chown -R 1001:1001 . MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" \ diff --git a/run-tests-against-all-dbs.sh b/run-tests-against-all-dbs.sh deleted file mode 100755 index 1fb700b4d..000000000 --- a/run-tests-against-all-dbs.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -mvn clean install -Pall-dbs