Skip to content

Commit 5e4ea3e

Browse files
authored
Do not cache external snapshot dependencies (#12100)
Signed-off-by: David Kornel <kornys@outlook.com>
1 parent a243050 commit 5e4ea3e

6 files changed

Lines changed: 30 additions & 2 deletions

File tree

.azure/templates/jobs/build/build_strimzi.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,3 +66,6 @@ jobs:
6666
displayName: "Tar the binaries"
6767
- publish: $(System.DefaultWorkingDirectory)/binaries.tar
6868
artifact: Binaries
69+
70+
# Clean SNAPSHOT dependencies before caching
71+
- template: "../../steps/clean_maven_snapshots.yaml"

.azure/templates/jobs/build/deploy_strimzi_java.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,7 @@ jobs:
3232
GPG_PASSPHRASE: $(GPG_PASSPHRASE)
3333
GPG_SIGNING_KEY: $(GPG_SIGNING_KEY)
3434
CENTRAL_USERNAME: $(CENTRAL_USERNAME)
35-
CENTRAL_PASSWORD: $(CENTRAL_PASSWORD)
35+
CENTRAL_PASSWORD: $(CENTRAL_PASSWORD)
36+
37+
# Clean SNAPSHOT dependencies before caching
38+
- template: "../../steps/clean_maven_snapshots.yaml"

.azure/templates/jobs/build/test_strimzi.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,7 @@ jobs:
4646
- task: PublishCodeCoverageResults@2
4747
inputs:
4848
summaryFileLocation: $(System.DefaultWorkingDirectory)/**/target/site/jacoco/jacoco.xml
49-
displayName: "Publish Test Coverage"
49+
displayName: "Publish Test Coverage"
50+
51+
# Clean SNAPSHOT dependencies before caching
52+
- template: "../../steps/clean_maven_snapshots.yaml"
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
steps:
2+
# Clean external SNAPSHOT dependencies before caching
3+
- bash: |
4+
mvn dependency:purge-local-repository \
5+
-DsnapshotsOnly=true \
6+
-DreResolve=false -q || true
7+
displayName: "Clean external SNAPSHOT dependencies"

.azure/templates/steps/system_test_general.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,9 @@ jobs:
161161
CONNECT_IMAGE_WITH_FILE_SINK_PLUGIN: $(connectImage)
162162
displayName: 'Run systemtests'
163163

164+
# Clean SNAPSHOT dependencies before caching
165+
- template: "./clean_maven_snapshots.yaml"
166+
164167
- task: PublishTestResults@2
165168
inputs:
166169
testResultsFormat: JUnit

.github/actions/build/build-strimzi-binaries/action.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,15 @@ runs:
109109
name: strimzi-binaries.tar
110110
path: strimzi-binaries.tar
111111

112+
# Clean external SNAPSHOT dependencies before caching
113+
- name: Clean external SNAPSHOT dependencies from Maven repository
114+
if: github.ref == 'refs/heads/main'
115+
shell: bash
116+
run: |
117+
mvn dependency:purge-local-repository \
118+
-DsnapshotsOnly=true \
119+
-DreResolve=false || true
120+
112121
# Save maven cache for main branches
113122
- name: Save Maven cache
114123
if: github.ref == 'refs/heads/main'

0 commit comments

Comments
 (0)