Skip to content

Commit

Permalink
Merge branch 'main' into 1022-fix-spanner-jdbc-driver-requires-protob…
Browse files Browse the repository at this point in the history 
…uf-version-which-provides-mapfieldreflectionaccessor
  • Loading branch information
@rajc242
rajc242 authored Nov 13, 2024
2 parents e24119a + 7bea95b commit 15378b8
Show file tree
Hide file tree
Showing 3 changed files with 165 additions and 165 deletions.
198 changes: 99 additions & 99 deletions java/.ci/Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,15 +99,15 @@ EOF
}
//Deploy one time so that build is copied to GCS location
stage('JDBC TO BQ'){
// when {
// expression {
// // Check if there are any changes in Java files in the last commit
// return sh(
// script: 'git diff --name-only HEAD~1 | grep -q ".java"',
// returnStatus: true
// ) == 0
// }
// }
when {
expression {
// Check for changes in .java files, the pom.xml file, or the two Jenkinsfiles in their specific paths
return sh(
script: 'git diff --name-only HEAD~1 | grep -E ".java$|java/pom.xml|java/.ci/Jenkinsfile|java/.ci/UiJenkinsfile"',
returnStatus: true
) == 0
}
}
steps {
retry(count: stageRetryCount) {
sh '''
Expand All @@ -128,15 +128,15 @@ EOF
}
}
stage('Parallel Execution 1'){
// when {
// expression {
// // Check if there are any changes in Java files in the last commit
// return sh(
// script: 'git diff --name-only HEAD~1 | grep -q ".java"',
// returnStatus: true
// ) == 0
// }
// }
when {
expression {
// Check for changes in .java files, the pom.xml file, or the two Jenkinsfiles in their specific paths
return sh(
script: 'git diff --name-only HEAD~1 | grep -E ".java$|java/pom.xml|java/.ci/Jenkinsfile|java/.ci/UiJenkinsfile"',
returnStatus: true
) == 0
}
}
parallel{
stage('GCS TO BIGQUERY(avro)') {
steps{
Expand Down Expand Up @@ -260,15 +260,15 @@ EOF
}
}
stage('Parallel Execution 2'){
// when {
// expression {
// // Check if there are any changes in Java files in the last commit
// return sh(
// script: 'git diff --name-only HEAD~1 | grep -q ".java"',
// returnStatus: true
// ) == 0
// }
// }
when {
expression {
// Check for changes in .java files, the pom.xml file, or the two Jenkinsfiles in their specific paths
return sh(
script: 'git diff --name-only HEAD~1 | grep -E ".java$|java/pom.xml|java/.ci/Jenkinsfile|java/.ci/UiJenkinsfile"',
returnStatus: true
) == 0
}
}
parallel{
stage('GCS TO JDBC') {
steps{
Expand Down Expand Up @@ -389,15 +389,15 @@ EOF
}
}
stage('Parallel Execution 3'){
// when {
// expression {
// // Check if there are any changes in Java files in the last commit
// return sh(
// script: 'git diff --name-only HEAD~1 | grep -q ".java"',
// returnStatus: true
// ) == 0
// }
// }
when {
expression {
// Check for changes in .java files, the pom.xml file, or the two Jenkinsfiles in their specific paths
return sh(
script: 'git diff --name-only HEAD~1 | grep -E ".java$|java/pom.xml|java/.ci/Jenkinsfile|java/.ci/UiJenkinsfile"',
returnStatus: true
) == 0
}
}
parallel{
stage('Hive TO GCS'){
steps {
Expand Down Expand Up @@ -492,15 +492,15 @@ EOF
}
}
stage('Parallel Execution 4'){
// when {
// expression {
// // Check if there are any changes in Java files in the last commit
// return sh(
// script: 'git diff --name-only HEAD~1 | grep -q ".java"',
// returnStatus: true
// ) == 0
// }
// }
when {
expression {
// Check for changes in .java files, the pom.xml file, or the two Jenkinsfiles in their specific paths
return sh(
script: 'git diff --name-only HEAD~1 | grep -E ".java$|java/pom.xml|java/.ci/Jenkinsfile|java/.ci/UiJenkinsfile"',
returnStatus: true
) == 0
}
}
parallel{
stage('JDBC TO SPANNER GOOGLESQL DIALECT'){
steps {
Expand Down Expand Up @@ -601,15 +601,15 @@ EOF
}
}
stage('Parallel Execution 5'){
// when {
// expression {
// // Check if there are any changes in Java files in the last commit
// return sh(
// script: 'git diff --name-only HEAD~1 | grep -q ".java"',
// returnStatus: true
// ) == 0
// }
// }
when {
expression {
// Check for changes in .java files, the pom.xml file, or the two Jenkinsfiles in their specific paths
return sh(
script: 'git diff --name-only HEAD~1 | grep -E ".java$|java/pom.xml|java/.ci/Jenkinsfile|java/.ci/UiJenkinsfile"',
returnStatus: true
) == 0
}
}
parallel{
stage('KAFKA TO GCS'){
steps {
Expand Down Expand Up @@ -697,15 +697,15 @@ EOF
}
}
stage('Parallel Execution 6'){
// when {
// expression {
// // Check if there are any changes in Java files in the last commit
// return sh(
// script: 'git diff --name-only HEAD~1 | grep -q ".java"',
// returnStatus: true
// ) == 0
// }
// }
when {
expression {
// Check for changes in .java files, the pom.xml file, or the two Jenkinsfiles in their specific paths
return sh(
script: 'git diff --name-only HEAD~1 | grep -E ".java$|java/pom.xml|java/.ci/Jenkinsfile|java/.ci/UiJenkinsfile"',
returnStatus: true
) == 0
}
}
parallel{
stage('GCS TO BIGTABLE'){
steps {
Expand Down Expand Up @@ -800,15 +800,15 @@ EOF
}
}
stage('Parallel Execution 7'){
// when {
// expression {
// // Check if there are any changes in Java files in the last commit
// return sh(
// script: 'git diff --name-only HEAD~1 | grep -q ".java"',
// returnStatus: true
// ) == 0
// }
// }
when {
expression {
// Check for changes in .java files, the pom.xml file, or the two Jenkinsfiles in their specific paths
return sh(
script: 'git diff --name-only HEAD~1 | grep -E ".java$|java/pom.xml|java/.ci/Jenkinsfile|java/.ci/UiJenkinsfile"',
returnStatus: true
) == 0
}
}
parallel{
stage('Cassandra to GCS (avro)'){
steps {
Expand Down Expand Up @@ -882,15 +882,15 @@ EOF
}
}
stage('Parallel Execution 8'){
// when {
// expression {
// // Check if there are any changes in Java files in the last commit
// return sh(
// script: 'git diff --name-only HEAD~1 | grep -q ".java"',
// returnStatus: true
// ) == 0
// }
// }
when {
expression {
// Check for changes in .java files, the pom.xml file, or the two Jenkinsfiles in their specific paths
return sh(
script: 'git diff --name-only HEAD~1 | grep -E ".java$|java/pom.xml|java/.ci/Jenkinsfile|java/.ci/UiJenkinsfile"',
returnStatus: true
) == 0
}
}
parallel{
stage('BIGQUERY TO GCS (csv)'){
steps {
Expand Down Expand Up @@ -987,15 +987,15 @@ EOF
}
}
stage('Parallel Execution 9'){
// when {
// expression {
// // Check if there are any changes in Java files in the last commit
// return sh(
// script: 'git diff --name-only HEAD~1 | grep -q ".java"',
// returnStatus: true
// ) == 0
// }
// }
when {
expression {
// Check for changes in .java files, the pom.xml file, or the two Jenkinsfiles in their specific paths
return sh(
script: 'git diff --name-only HEAD~1 | grep -E ".java$|java/pom.xml|java/.ci/Jenkinsfile|java/.ci/UiJenkinsfile"',
returnStatus: true
) == 0
}
}
parallel{
stage('KAFKA TO BQ via Dstream'){
steps {
Expand Down Expand Up @@ -1103,15 +1103,15 @@ EOF
}
}
stage('Parallel Execution 10'){
// when {
// expression {
// // Check if there are any changes in Java files in the last commit
// return sh(
// script: 'git diff --name-only HEAD~1 | grep -q ".java"',
// returnStatus: true
// ) == 0
// }
// }
when {
expression {
// Check for changes in .java files, the pom.xml file, or the two Jenkinsfiles in their specific paths
return sh(
script: 'git diff --name-only HEAD~1 | grep -E ".java$|java/pom.xml|java/.ci/Jenkinsfile|java/.ci/UiJenkinsfile"',
returnStatus: true
) == 0
}
}
parallel{
stage('GCS TO SPANNER POSTGRESQL DIALECT') {
steps{
Expand Down
20 changes: 10 additions & 10 deletions java/.ci/UiJenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ pipeline {
stage('Parallel Execution 1'){
when {
expression {
// Check if there are any changes in Java files in the last commit
// Check for changes in .java files, the pom.xml file, or the two Jenkinsfiles in their specific paths
return sh(
script: 'git diff --name-only HEAD~1 | grep -q ".java"',
script: 'git diff --name-only HEAD~1 | grep -E ".java$|java/pom.xml|java/.ci/Jenkinsfile|java/.ci/UiJenkinsfile"',
returnStatus: true
) == 0
}
Expand Down Expand Up @@ -184,9 +184,9 @@ pipeline {
stage('Parallel Execution 2'){
when {
expression {
// Check if there are any changes in Java files in the last commit
// Check for changes in .java files, the pom.xml file, or the two Jenkinsfiles in their specific paths
return sh(
script: 'git diff --name-only HEAD~1 | grep -q ".java"',
script: 'git diff --name-only HEAD~1 | grep -E ".java$|java/pom.xml|java/.ci/Jenkinsfile|java/.ci/UiJenkinsfile"',
returnStatus: true
) == 0
}
Expand Down Expand Up @@ -286,9 +286,9 @@ pipeline {
stage('Parallel Execution 3'){
when {
expression {
// Check if there are any changes in Java files in the last commit
// Check for changes in .java files, the pom.xml file, or the two Jenkinsfiles in their specific paths
return sh(
script: 'git diff --name-only HEAD~1 | grep -q ".java"',
script: 'git diff --name-only HEAD~1 | grep -E ".java$|java/pom.xml|java/.ci/Jenkinsfile|java/.ci/UiJenkinsfile"',
returnStatus: true
) == 0
}
Expand Down Expand Up @@ -366,9 +366,9 @@ pipeline {
stage('Parallel Execution 4'){
when {
expression {
// Check if there are any changes in Java files in the last commit
// Check for changes in .java files, the pom.xml file, or the two Jenkinsfiles in their specific paths
return sh(
script: 'git diff --name-only HEAD~1 | grep -q ".java"',
script: 'git diff --name-only HEAD~1 | grep -E ".java$|java/pom.xml|java/.ci/Jenkinsfile|java/.ci/UiJenkinsfile"',
returnStatus: true
) == 0
}
Expand Down Expand Up @@ -424,9 +424,9 @@ pipeline {
stage('Parallel Execution 5'){
when {
expression {
// Check if there are any changes in Java files in the last commit
// Check for changes in .java files, the pom.xml file, or the two Jenkinsfiles in their specific paths
return sh(
script: 'git diff --name-only HEAD~1 | grep -q ".java"',
script: 'git diff --name-only HEAD~1 | grep -E ".java$|java/pom.xml|java/.ci/Jenkinsfile|java/.ci/UiJenkinsfile"',
returnStatus: true
) == 0
}
Expand Down
Loading

0 comments on commit 15378b8

Please sign in to comment.