From 12b9a7fc4b6cd4fbbfdaeca6a91070440cbe5ebc Mon Sep 17 00:00:00 2001 From: andoni-guzman Date: Fri, 10 Jun 2022 15:49:58 -0500 Subject: [PATCH 1/7] Create job for preComimt AWS IO Direct from Java PostCommit job --- .../job_PreCommit_Java_AWS_IO_Direct.groovy | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 .test-infra/jenkins/job_PreCommit_Java_AWS_IO_Direct.groovy diff --git a/.test-infra/jenkins/job_PreCommit_Java_AWS_IO_Direct.groovy b/.test-infra/jenkins/job_PreCommit_Java_AWS_IO_Direct.groovy new file mode 100644 index 000000000000..b32a5e94564d --- /dev/null +++ b/.test-infra/jenkins/job_PreCommit_Java_AWS_IO_Direct.groovy @@ -0,0 +1,38 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import PrecommitJobBuilder + +PrecommitJobBuilder builder = new PrecommitJobBuilder( + scope: this, + nameBase: 'Java_amazon-web-services_IO_Direct', + gradleTask: ':sdks:java:io:amazon-web-services:integrationTest', + gradleSwitches: [ + '-PdisableSpotlessCheck=true' + ], // spotless checked in separate pre-commit + triggerPathPatterns: [ + '^sdks/java/io/amazon-web-services/.*$', + '^runners/direct-java/.*$', + ], + timeoutMins: 60, +) +builder.build { + publishers { + archiveJunit('**/build/test-results/**/*.xml') + } +} \ No newline at end of file From c6b5b3d5c6ae0b03eb05fa15a872d9968295d62e Mon Sep 17 00:00:00 2001 From: andoni-guzman Date: Fri, 10 Jun 2022 15:50:33 -0500 Subject: [PATCH 2/7] Create preCommit Job for AWS2 IO Direct from Java PostCommit job --- .../job_PreCommit_Java_AWS2_IO_Direct.groovy | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 .test-infra/jenkins/job_PreCommit_Java_AWS2_IO_Direct.groovy diff --git a/.test-infra/jenkins/job_PreCommit_Java_AWS2_IO_Direct.groovy b/.test-infra/jenkins/job_PreCommit_Java_AWS2_IO_Direct.groovy new file mode 100644 index 000000000000..e04ab9d0efcc --- /dev/null +++ b/.test-infra/jenkins/job_PreCommit_Java_AWS2_IO_Direct.groovy @@ -0,0 +1,38 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import PrecommitJobBuilder + +PrecommitJobBuilder builder = new PrecommitJobBuilder( + scope: this, + nameBase: 'Java_amazon-web-services2_IO_Direct', + gradleTask: 'sdks:java:io:amazon-web-services2:integrationTest', + gradleSwitches: [ + '-PdisableSpotlessCheck=true' + ], // spotless checked in separate pre-commit + triggerPathPatterns: [ + '^sdks/java/io/amazon-web-services2/.*$', + '^runners/direct-java/.*$', + ], + timeoutMins: 120, +) +builder.build { + publishers { + archiveJunit('**/build/test-results/**/*.xml') + } +} \ No newline at end of file From 5487dc2223fdb271bca39ba4cf1b157ae21e492c Mon Sep 17 00:00:00 2001 From: andoni-guzman Date: Fri, 10 Jun 2022 15:51:06 -0500 Subject: [PATCH 3/7] Delete AWS and AWS2 gradle task from build.gradle.kms --- build.gradle.kts | 2 -- 1 file changed, 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index c6c0059f62ae..a7cfdbcd6d38 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -200,8 +200,6 @@ tasks.register("javaPostCommit") { dependsOn(":sdks:java:io:jdbc:integrationTest") dependsOn(":sdks:java:io:google-cloud-platform:postCommit") dependsOn(":sdks:java:io:kinesis:integrationTest") - dependsOn(":sdks:java:io:amazon-web-services:integrationTest") - dependsOn(":sdks:java:io:amazon-web-services2:integrationTest") dependsOn(":sdks:java:extensions:ml:postCommit") dependsOn(":sdks:java:io:kafka:kafkaVersionsCompatibilityTest") dependsOn(":sdks:java:io:neo4j:integrationTest") From 91c8eccceabec6a1e8abc88fc0636e0e19978158 Mon Sep 17 00:00:00 2001 From: andoni-guzman Date: Fri, 10 Jun 2022 16:36:43 -0500 Subject: [PATCH 4/7] Fix Spotless --- .../job_PreCommit_Java_AWS2_IO_Direct.groovy | 30 +++++++++---------- .../job_PreCommit_Java_AWS_IO_Direct.groovy | 30 +++++++++---------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.test-infra/jenkins/job_PreCommit_Java_AWS2_IO_Direct.groovy b/.test-infra/jenkins/job_PreCommit_Java_AWS2_IO_Direct.groovy index e04ab9d0efcc..a2a54a7ccdc2 100644 --- a/.test-infra/jenkins/job_PreCommit_Java_AWS2_IO_Direct.groovy +++ b/.test-infra/jenkins/job_PreCommit_Java_AWS2_IO_Direct.groovy @@ -19,20 +19,20 @@ import PrecommitJobBuilder PrecommitJobBuilder builder = new PrecommitJobBuilder( - scope: this, - nameBase: 'Java_amazon-web-services2_IO_Direct', - gradleTask: 'sdks:java:io:amazon-web-services2:integrationTest', - gradleSwitches: [ - '-PdisableSpotlessCheck=true' - ], // spotless checked in separate pre-commit - triggerPathPatterns: [ - '^sdks/java/io/amazon-web-services2/.*$', - '^runners/direct-java/.*$', - ], - timeoutMins: 120, -) + scope: this, + nameBase: 'Java_Amazon-Web-Services2_IO_Direct', + gradleTask: 'sdks:java:io:amazon-web-services2:integrationTest', + gradleSwitches: [ + '-PdisableSpotlessCheck=true' + ], // spotless checked in separate pre-commit + triggerPathPatterns: [ + '^sdks/java/io/amazon-web-services2/.*$', + '^runners/direct-java/.*$', + ], + timeoutMins: 120, + ) builder.build { - publishers { - archiveJunit('**/build/test-results/**/*.xml') - } + publishers { + archiveJunit('**/build/test-results/**/*.xml') + } } \ No newline at end of file diff --git a/.test-infra/jenkins/job_PreCommit_Java_AWS_IO_Direct.groovy b/.test-infra/jenkins/job_PreCommit_Java_AWS_IO_Direct.groovy index b32a5e94564d..49f2ab8c9202 100644 --- a/.test-infra/jenkins/job_PreCommit_Java_AWS_IO_Direct.groovy +++ b/.test-infra/jenkins/job_PreCommit_Java_AWS_IO_Direct.groovy @@ -19,20 +19,20 @@ import PrecommitJobBuilder PrecommitJobBuilder builder = new PrecommitJobBuilder( - scope: this, - nameBase: 'Java_amazon-web-services_IO_Direct', - gradleTask: ':sdks:java:io:amazon-web-services:integrationTest', - gradleSwitches: [ - '-PdisableSpotlessCheck=true' - ], // spotless checked in separate pre-commit - triggerPathPatterns: [ - '^sdks/java/io/amazon-web-services/.*$', - '^runners/direct-java/.*$', - ], - timeoutMins: 60, -) + scope: this, + nameBase: 'Java_Amazon-Web-Services_IO_Direct', + gradleTask: ':sdks:java:io:amazon-web-services:integrationTest', + gradleSwitches: [ + '-PdisableSpotlessCheck=true' + ], // spotless checked in separate pre-commit + triggerPathPatterns: [ + '^sdks/java/io/amazon-web-services/.*$', + '^runners/direct-java/.*$', + ], + timeoutMins: 120, + ) builder.build { - publishers { - archiveJunit('**/build/test-results/**/*.xml') - } + publishers { + archiveJunit('**/build/test-results/**/*.xml') + } } \ No newline at end of file From b943b4d482642667e12df28a00e58b67c9483e1a Mon Sep 17 00:00:00 2001 From: andoni-guzman Date: Wed, 15 Jun 2022 16:02:16 -0500 Subject: [PATCH 5/7] Delete direct runner trigger path --- .../job_PreCommit_Java_AWS2_IO_Direct.groovy | 25 +++++++++---------- .../job_PreCommit_Java_AWS_IO_Direct.groovy | 23 ++++++++--------- 2 files changed, 23 insertions(+), 25 deletions(-) diff --git a/.test-infra/jenkins/job_PreCommit_Java_AWS2_IO_Direct.groovy b/.test-infra/jenkins/job_PreCommit_Java_AWS2_IO_Direct.groovy index a2a54a7ccdc2..2b734c227ec7 100644 --- a/.test-infra/jenkins/job_PreCommit_Java_AWS2_IO_Direct.groovy +++ b/.test-infra/jenkins/job_PreCommit_Java_AWS2_IO_Direct.groovy @@ -19,20 +19,19 @@ import PrecommitJobBuilder PrecommitJobBuilder builder = new PrecommitJobBuilder( - scope: this, - nameBase: 'Java_Amazon-Web-Services2_IO_Direct', - gradleTask: 'sdks:java:io:amazon-web-services2:integrationTest', - gradleSwitches: [ - '-PdisableSpotlessCheck=true' - ], // spotless checked in separate pre-commit - triggerPathPatterns: [ - '^sdks/java/io/amazon-web-services2/.*$', - '^runners/direct-java/.*$', - ], - timeoutMins: 120, - ) + scope: this, + nameBase: 'Java_Amazon-Web-Services2_IO_Direct', + gradleTask: 'sdks:java:io:amazon-web-services2:integrationTest', + gradleSwitches: [ + '-PdisableSpotlessCheck=true' + ], // spotless checked in separate pre-commit + triggerPathPatterns: [ + '^sdks/java/io/amazon-web-services2/.*$', + ], + timeoutMins: 120, + ) builder.build { publishers { - archiveJunit('**/build/test-results/**/*.xml') + archiveJunit('**/build/test-results/**/*.xml') } } \ No newline at end of file diff --git a/.test-infra/jenkins/job_PreCommit_Java_AWS_IO_Direct.groovy b/.test-infra/jenkins/job_PreCommit_Java_AWS_IO_Direct.groovy index 49f2ab8c9202..d7e68c70b0da 100644 --- a/.test-infra/jenkins/job_PreCommit_Java_AWS_IO_Direct.groovy +++ b/.test-infra/jenkins/job_PreCommit_Java_AWS_IO_Direct.groovy @@ -19,20 +19,19 @@ import PrecommitJobBuilder PrecommitJobBuilder builder = new PrecommitJobBuilder( - scope: this, - nameBase: 'Java_Amazon-Web-Services_IO_Direct', - gradleTask: ':sdks:java:io:amazon-web-services:integrationTest', - gradleSwitches: [ - '-PdisableSpotlessCheck=true' - ], // spotless checked in separate pre-commit - triggerPathPatterns: [ - '^sdks/java/io/amazon-web-services/.*$', - '^runners/direct-java/.*$', + scope: this, + nameBase: 'Java_Amazon-Web-Services_IO_Direct', + gradleTask: ':sdks:java:io:amazon-web-services:integrationTest', + gradleSwitches: [ + '-PdisableSpotlessCheck=true' + ], // spotless checked in separate pre-commit + triggerPathPatterns: [ + '^sdks/java/io/amazon-web-services/.*$', ], - timeoutMins: 120, - ) + timeoutMins: 120, + ) builder.build { publishers { - archiveJunit('**/build/test-results/**/*.xml') + archiveJunit('**/build/test-results/**/*.xml') } } \ No newline at end of file From 6560ab07ad5737b4a7c71ea4ce6950ea491e62da Mon Sep 17 00:00:00 2001 From: andoni-guzman Date: Wed, 15 Jun 2022 17:42:39 -0500 Subject: [PATCH 6/7] Resolve merge conflict --- build.gradle.kts | 1 - 1 file changed, 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index b6b19039c594..527fc4fc73ed 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -197,7 +197,6 @@ tasks.register("javaPostCommit") { dependsOn(":sdks:java:extensions:google-cloud-platform-core:postCommit") dependsOn(":sdks:java:extensions:zetasketch:postCommit") dependsOn(":sdks:java:io:google-cloud-platform:postCommit") - dependsOn(":sdks:java:io:kinesis:integrationTest") dependsOn(":sdks:java:extensions:ml:postCommit") } From 3e47bc2e74b7afe9a9093a9295773a2ee791de9e Mon Sep 17 00:00:00 2001 From: andoni-guzman Date: Wed, 29 Jun 2022 11:27:10 -0500 Subject: [PATCH 7/7] Resolve merge conflict --- build.gradle.kts | 1 - 1 file changed, 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index bd8f0967b20d..aa5f8949fa51 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -196,7 +196,6 @@ tasks.register("javaPreCommitPortabilityApi") { tasks.register("javaPostCommit") { dependsOn(":sdks:java:extensions:google-cloud-platform-core:postCommit") dependsOn(":sdks:java:extensions:zetasketch:postCommit") - dependsOn(":sdks:java:io:google-cloud-platform:postCommit") dependsOn(":sdks:java:extensions:ml:postCommit") }