Skip to content

Commit e507f59

Browse files
beikovbeikov
committed
HHH-17297 Adapt limited support testing for 6.2
1 parent 79bbd9d commit e507f59

File tree

7 files changed

+68
-398
lines changed

7 files changed

+68
-398
lines changed

‎Jenkinsfile‎

Lines changed: 5 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -26,43 +26,16 @@ this.helper = new JobHelper(this)
2626
helper.runWithNotification {
2727
stage('Configure') {
2828
this.environments = [
29-
// new BuildEnvironment( dbName: 'h2' ),
30-
// new BuildEnvironment( dbName: 'hsqldb' ),
31-
// new BuildEnvironment( dbName: 'derby' ),
32-
// new BuildEnvironment( dbName: 'mysql' ),
33-
// new BuildEnvironment( dbName: 'mariadb' ),
34-
// new BuildEnvironment( dbName: 'postgresql' ),
35-
// new BuildEnvironment( dbName: 'edb' ),
36-
// new BuildEnvironment( dbName: 'oracle' ),
37-
// new BuildEnvironment( dbName: 'db2' ),
38-
// new BuildEnvironment( dbName: 'mssql' ),
39-
// new BuildEnvironment( dbName: 'sybase' ),
40-
// Don't build with HANA by default, but only do it nightly until we receive a 3rd instance
41-
// new BuildEnvironment( dbName: 'hana_cloud', dbLockableResource: 'hana-cloud', dbLockResourceAsHost: true ),
4229
new BuildEnvironment( node: 's390x' ),
43-
new BuildEnvironment( dbName: 'tidb', node: 'tidb',
44-
notificationRecipients: 'tidb_hibernate@pingcap.com' ),
30+
new BuildEnvironment( dbName: 'sybase_jconn' ),
4531
new BuildEnvironment( testJdkVersion: '17' ),
32+
new BuildEnvironment( testJdkVersion: '21' ),
4633
// We want to enable preview features when testing newer builds of OpenJDK:
4734
// even if we don't use these features, just enabling them can cause side effects
4835
// and it's useful to test that.
49-
new BuildEnvironment( testJdkVersion: '20', testJdkLauncherArgs: '--enable-preview' ),
50-
new BuildEnvironment( testJdkVersion: '21', testJdkLauncherArgs: '--enable-preview' ),
5136
new BuildEnvironment( testJdkVersion: '22', testJdkLauncherArgs: '--enable-preview' )
5237
];
5338

54-
if ( env.CHANGE_ID ) {
55-
if ( pullRequest.labels.contains( 'cockroachdb' ) ) {
56-
this.environments.add( new BuildEnvironment( dbName: 'cockroachdb', node: 'cockroachdb', longRunning: true ) )
57-
}
58-
if ( pullRequest.labels.contains( 'hana' ) ) {
59-
this.environments.add( new BuildEnvironment( dbName: 'hana_cloud', dbLockableResource: 'hana-cloud', dbLockResourceAsHost: true ) )
60-
}
61-
if ( pullRequest.labels.contains( 'sybase' ) ) {
62-
this.environments.add( new BuildEnvironment( dbName: 'sybase_jconn' ) )
63-
}
64-
}
65-
6639
helper.configure {
6740
file 'job-configuration.yaml'
6841
// We don't require the following, but the build helper plugin apparently does
@@ -86,19 +59,15 @@ stage('Configure') {
8659

8760
// Avoid running the pipeline on branch indexing
8861
if (currentBuild.getBuildCauses().toString().contains('BranchIndexingCause')) {
89-
print "INFO: Build skipped due to trigger being Branch Indexing"
90-
currentBuild.result = 'ABORTED'
91-
return
62+
print "INFO: Build skipped due to trigger being Branch Indexing"
63+
currentBuild.result = 'NOT_BUILT'
64+
return
9265
}
9366

9467
stage('Build') {
9568
Map<String, Closure> executions = [:]
9669
Map<String, Map<String, String>> state = [:]
9770
environments.each { BuildEnvironment buildEnv ->
98-
// Don't build environments for newer JDKs when this is a PR
99-
if ( helper.scmSource.pullRequest && buildEnv.testJdkVersion ) {
100-
return
101-
}
10271
state[buildEnv.tag] = [:]
10372
executions.put(buildEnv.tag, {
10473
runBuildOnNode(buildEnv.node ?: NODE_PATTERN_BASE) {
@@ -138,13 +107,6 @@ stage('Build') {
138107
sh "./docker_db.sh sybase"
139108
state[buildEnv.tag]['containerName'] = "sybase"
140109
break;
141-
case "cockroachdb":
142-
docker.withRegistry('https://index.docker.io/v1/', 'hibernateci.hub.docker.com') {
143-
docker.image('cockroachdb/cockroach:v23.1.8').pull()
144-
}
145-
sh "./docker_db.sh cockroachdb"
146-
state[buildEnv.tag]['containerName'] = "cockroach"
147-
break;
148110
}
149111
}
150112
stage('Test') {

‎ci/jpa-3.1-tck.Jenkinsfile‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
// Avoid running the pipeline on branch indexing
44
if (currentBuild.getBuildCauses().toString().contains('BranchIndexingCause')) {
5-
print "INFO: Build skipped due to trigger being Branch Indexing"
6-
currentBuild.result = 'ABORTED'
7-
return
5+
print "INFO: Build skipped due to trigger being Branch Indexing"
6+
currentBuild.result = 'NOT_BUILT'
7+
return
88
}
99

1010
pipeline {
@@ -15,7 +15,6 @@ pipeline {
1515
jdk 'OpenJDK 11 Latest'
1616
}
1717
options {
18-
rateLimitBuilds(throttle: [count: 1, durationName: 'day', userBoost: true])
1918
buildDiscarder(logRotator(numToKeepStr: '3', artifactNumToKeepStr: '3'))
2019
disableConcurrentBuilds(abortPrevious: true)
2120
}

‎ci/jpa-3.2-tck.Jenkinsfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
// Avoid running the pipeline on branch indexing
44
if (currentBuild.getBuildCauses().toString().contains('BranchIndexingCause')) {
5-
print "INFO: Build skipped due to trigger being Branch Indexing"
6-
currentBuild.result = 'ABORTED'
7-
return
5+
print "INFO: Build skipped due to trigger being Branch Indexing"
6+
currentBuild.result = 'NOT_BUILT'
7+
return
88
}
99

1010
pipeline {

‎ci/quarkus.Jenkinsfile‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
@Library('hibernate-jenkins-pipeline-helpers@1.5') _
2+
3+
// Avoid running the pipeline on branch indexing
4+
if (currentBuild.getBuildCauses().toString().contains('BranchIndexingCause')) {
5+
print "INFO: Build skipped due to trigger being Branch Indexing"
6+
currentBuild.result = 'NOT_BUILT'
7+
return
8+
}
9+
10+
pipeline {
11+
agent {
12+
label 'LongDuration'
13+
}
14+
tools {
15+
jdk 'OpenJDK 17 Latest'
16+
}
17+
options {
18+
buildDiscarder(logRotator(numToKeepStr: '3', artifactNumToKeepStr: '3'))
19+
disableConcurrentBuilds(abortPrevious: true)
20+
}
21+
environment {
22+
MAVEN_OPTS = '-Xmx2g -XX:MaxMetaspaceSize=1g'
23+
}
24+
stages {
25+
stage('Build') {
26+
steps {
27+
script {
28+
sh './gradlew publishToMavenLocal --no-daemon'
29+
script {
30+
env.HIBERNATE_VERSION = sh (
31+
script: "grep hibernateVersion gradle/version.properties|cut -d'=' -f2",
32+
returnStdout: true
33+
).trim()
34+
}
35+
dir('.release/quarkus') {
36+
// checkout scmGit(branches: [[name: '*/orm-update']], extensions: [], userRemoteConfigs: [[credentialsId: 'ed25519.Hibernate-CI.github.com', url: 'https://github.com/beikov/quarkus.git']])
37+
checkout scmGit(branches: [[name: '*/main']], extensions: [], userRemoteConfigs: [[credentialsId: 'ed25519.Hibernate-CI.github.com', url: 'https://github.com/quarkusio/quarkus.git']])
38+
sh "sed -i 's@<hibernate-orm.version>.*</hibernate-orm.version>@<hibernate-orm.version>${env.HIBERNATE_VERSION}</hibernate-orm.version>@' bom/application/pom.xml"
39+
sh './mvnw -Dquickly install'
40+
sh './mvnw -pl :quarkus-hibernate-orm -amd -pl "!integration-tests/kafka-oauth-keycloak" verify -Dstart-containers -Dtest-containers'
41+
}
42+
}
43+
}
44+
}
45+
}
46+
post {
47+
always {
48+
configFileProvider([configFile(fileId: 'job-configuration.yaml', variable: 'JOB_CONFIGURATION_FILE')]) {
49+
notifyBuildResult maintainers: (String) readYaml(file: env.JOB_CONFIGURATION_FILE).notification?.email?.recipients
50+
}
51+
}
52+
}
53+
}

‎ci/release/Jenkinsfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// Avoid running the pipeline on branch indexing
1515
if (currentBuild.getBuildCauses().toString().contains('BranchIndexingCause')) {
1616
print "INFO: Build skipped due to trigger being Branch Indexing"
17-
currentBuild.result = 'ABORTED'
17+
currentBuild.result = 'NOT_BUILT'
1818
return
1919
}
2020

‎ci/snapshot-publish.Jenkinsfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
// Avoid running the pipeline on branch indexing
77
if (currentBuild.getBuildCauses().toString().contains('BranchIndexingCause')) {
8-
print "INFO: Build skipped due to trigger being Branch Indexing"
9-
currentBuild.result = 'ABORTED'
10-
return
8+
print "INFO: Build skipped due to trigger being Branch Indexing"
9+
currentBuild.result = 'NOT_BUILT'
10+
return
1111
}
1212

1313
pipeline {

0 commit comments

Comments
 (0)