Skip to content

Commit

Permalink
HSEARCH-4395 Simplify Jenkins build jobs
Browse files Browse the repository at this point in the history
  • Loading branch information
marko-bekhta authored and yrodiere committed Jul 3, 2023
1 parent ee8046e commit d021daf
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 21 deletions.
18 changes: 0 additions & 18 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -483,24 +483,6 @@ stage('Non-default environments') {
-pl !integrationtest/java/modules/orm-elasticsearch \
-pl !integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch \
'''
if ( !buildEnv.slow ) {
// If the DB testing is reasonably fast, we'll also test ORM6 and Jakarta
artifactsToTest += ['hibernate-search-mapper-orm-orm6', 'hibernate-search-mapper-orm-jakarta']
mavenBuildAdditionalArgs += ''' \
-pl !orm6/documentation \
-pl !orm6/integrationtest/mapper/orm-batch-jsr352 \
-pl !orm6/integrationtest/v5migrationhelper/orm \
-pl !orm6/integrationtest/java/modules/orm-lucene \
-pl !orm6/integrationtest/java/modules/orm-elasticsearch \
-pl !orm6/integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch \
-pl !jakarta/documentation \
-pl !jakarta/integrationtest/mapper/orm-batch-jsr352 \
-pl !jakarta/integrationtest/v5migrationhelper/orm \
-pl !jakarta/integrationtest/java/modules/orm-lucene \
-pl !jakarta/integrationtest/java/modules/orm-elasticsearch \
-pl !jakarta/integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch \
'''
}
String mavenDockerArgs = ""
def startedContainers = false
// DB2 setup is super slow (~5 to 15 minutes).
Expand Down
4 changes: 1 addition & 3 deletions ci/list-dependent-integration-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ TESTED_ARTIFACT_IDS_REGEXP="(\Q$(echo "$*" | perl -pe 's/,/\\E|\\Q/g')\E)"

{
./mvnw -Pdist dependency:list -pl :hibernate-search-parent-integrationtest -am -amd -DincludeArtifactIds="$COMMA_SEPARATED_TESTED_ARTIFACT_IDS"
./mvnw -Pdist dependency:list -pl :hibernate-search-parent-integrationtest-orm6 -am -amd -DincludeArtifactIds="$COMMA_SEPARATED_TESTED_ARTIFACT_IDS"
./mvnw -Pdist dependency:list -pl :hibernate-search-parent-integrationtest-jakarta -am -amd -DincludeArtifactIds="$COMMA_SEPARATED_TESTED_ARTIFACT_IDS"
} \
| perl -0777 -pe "s/(hibernate-search-.*) ---(\n(?!.*Building).*)*\n.*:$TESTED_ARTIFACT_IDS_REGEXP:jar:/\nMATCH:\$1\n/g" \
| perl -ne 'print if s/MATCH:(.*)/:$1/g' \
| perl -0777 -pe 's/\n(?!$)/,/g'
| perl -0777 -pe 's/\n(?!$)/,/g'

0 comments on commit d021daf

Please sign in to comment.