From 3c2592e46a204f4a092deb869c48fa2294b18aed Mon Sep 17 00:00:00 2001 From: Christian Beikov Date: Mon, 29 Apr 2024 11:16:39 +0200 Subject: [PATCH] HHH-17982 Setup JPA 3.2 TCK testing automation for ORM 7 --- ci/jpa-3.2-tck.Jenkinsfile | 92 ++++++++++++++++++++++++++++++++------ 1 file changed, 78 insertions(+), 14 deletions(-) diff --git a/ci/jpa-3.2-tck.Jenkinsfile b/ci/jpa-3.2-tck.Jenkinsfile index 701f53f4f7..4b1d2013c2 100644 --- a/ci/jpa-3.2-tck.Jenkinsfile +++ b/ci/jpa-3.2-tck.Jenkinsfile @@ -32,11 +32,11 @@ pipeline { disableConcurrentBuilds(abortPrevious: true) } parameters { - choice(name: 'IMAGE_JDK', choices: ['jdk17'], description: 'The JDK base image version to use for the TCK image.') + choice(name: 'IMAGE_JDK', choices: ['jdk17', 'jdk21'], description: 'The JDK base image version to use for the TCK image.') string(name: 'TCK_VERSION', defaultValue: '3.2.0', description: 'The version of the Jakarta JPA TCK i.e. `2.2.0` or `3.0.1`') string(name: 'TCK_SHA', defaultValue: '', description: 'The SHA256 of the Jakarta JPA TCK that is distributed under https://download.eclipse.org/jakartaee/persistence/3.1/jakarta-persistence-tck-${TCK_VERSION}.zip.sha256') string(name: 'TCK_URL', defaultValue: 'https://www.eclipse.org/downloads/download.php?file=/ee4j/jakartaee-tck/jakartaee11/staged/eftl/jakarta-persistence-tck-3.2.0.zip&mirror_id=1', description: 'The URL from which to download the TCK ZIP file. Only needed for testing staged builds. Ensure the TCK_VERSION variable matches the ZIP file name suffix.') - booleanParam(name: 'NO_SLEEP', defaultValue: true, description: 'Whether the NO_SLEEP patch should be applied to speed up the TCK execution') + choice(name: 'RDBMS', choices: ['derby','mysql','mssql','oracle','postgresql','db2','sybase'], description: 'The JDK base image version to use for the TCK image.') } stages { stage('Build') { @@ -59,11 +59,48 @@ pipeline { dir('tck') { checkout changelog: false, poll: false, scm: [$class: 'GitSCM', branches: [[name: '*/main']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/hibernate/jakarta-tck-runner.git']]] script { - if ( params.TCK_URL == null || params.TCK_URL.isEmpty() ) { - sh "cd jpa-3.2; docker build -f Dockerfile.${params.IMAGE_JDK} -t jakarta-tck-runner --build-arg TCK_VERSION=${params.TCK_VERSION} --build-arg TCK_SHA=${params.TCK_SHA} ." + switch (params.RDBMS) { + case "mysql": + docker.withRegistry('https://index.docker.io/v1/', 'hibernateci.hub.docker.com') { + docker.image('mysql:8.2.0').pull() + } + sh "./docker_db.sh mysql" + break; + case "mssql": + docker.image('mcr.microsoft.com/mssql/server@sha256:5439be9edc3b514cf647bcd3651779fa13f487735a985f40cbdcfecc60fea273').pull() + sh "./docker_db.sh mssql" + break; + case "oracle": + docker.withRegistry('https://index.docker.io/v1/', 'hibernateci.hub.docker.com') { + docker.image('gvenzl/oracle-free:23').pull() + } + sh "./docker_db.sh oracle" + break; + case "postgresql": + docker.withRegistry('https://index.docker.io/v1/', 'hibernateci.hub.docker.com') { + docker.image('postgis/postgis:16-3.4').pull() + } + sh "./docker_db.sh postgresql" + break; + case "db2": + docker.image('icr.io/db2_community/db2:11.5.9.0').pull() + sh "./docker_db.sh db2" + break; + case "sybase": + docker.withRegistry('https://index.docker.io/v1/', 'hibernateci.hub.docker.com') { + docker.image('nguoianphu/docker-sybase').pull() + } + sh "./docker_db.sh sybase" + break; } - else { - sh "cd jpa-3.2; docker build -f Dockerfile.${params.IMAGE_JDK} -t jakarta-tck-runner --build-arg TCK_VERSION=${params.TCK_VERSION} --build-arg TCK_SHA=${params.TCK_SHA} --build-arg TCK_URL=${params.TCK_URL} ." + withCredentials([file(credentialsId: 'sybase-jconnect-driver', variable: 'jconnect_driver')]) { + sh 'cp -f $jconnect_driver ./jpa-3.2/jconn42.jar' + if ( params.TCK_URL == null || params.TCK_URL.isEmpty() ) { + sh "cd jpa-3.2; docker build -f Dockerfile.${params.IMAGE_JDK} -t jakarta-tck-runner --build-arg TCK_VERSION=${params.TCK_VERSION} --build-arg TCK_SHA=${params.TCK_SHA} ." + } + else { + sh "cd jpa-3.2; docker build -f Dockerfile.${params.IMAGE_JDK} -t jakarta-tck-runner --build-arg TCK_VERSION=${params.TCK_VERSION} --build-arg TCK_SHA=${params.TCK_SHA} --build-arg TCK_URL=${params.TCK_URL} ." + } } } } @@ -71,24 +108,41 @@ pipeline { } stage('Run TCK') { steps { + def containerName; + if ( params.RDBMS == 'postgresql' ) { + containerName = 'postgres' + } + else { + containerName = params.RDBMS + } sh """ \ rm -Rf ./results docker rm -f tck || true - docker volume rm -f tck-vol || true - docker volume create tck-vol - docker run -v ~/.m2/repository/org/hibernate:/root/.m2/repository/org/hibernate:z -v tck-vol:/tck/persistence-tck/tmp/:z -e NO_SLEEP=${params.NO_SLEEP} -e HIBERNATE_VERSION=$HIBERNATE_VERSION --name tck jakarta-tck-runner - docker cp tck:/tck/persistence-tck/tmp/ ./results + while IFS= read -r container; do + docker network disconnect tck-net \$container || true + done <<< $(docker network inspect tck-net --format '{{range $k, $v := .Containers}}{{print $k}}{{end}}') + docker network rm -f tck-net + docker network create tck-net + docker network connect tck-net $containerName + docker run -v ~/.m2/repository/org/hibernate:/root/.m2/repository/org/hibernate:z --network=tck-net -e DB_HOST=${containerName} -e RDBMS=${params.RDBMS} -e HIBERNATE_VERSION=$HIBERNATE_VERSION --name tck jakarta-tck-runner + docker cp tck:/tck/persistence-tck/bin/target/failsafe-reports ./results + docker cp tck:/tck/persistence-tck/bin/target/test-reports ./results """ archiveArtifacts artifacts: 'results/**' script { failures = sh ( script: """ \ - set +x while read line; do - if [[ "\$line" != *"Passed." ]]; then - echo "\$line" + if [[ "\$line" = *"-error\" style=\"display:none;\">" ]]; then + prefix1='' + line=\${line#"\$prefix1"} + line=\${line#"\$prefix2"} + test=\${line%"\$suffix"} + echo "\$test" fi - done