Skip to content

Commit 2e6328e

Browse files
jinseopkim0jinseopkim0
committed
ci: fix dashboard script goals and resolve first/third-party-dependencies GHA caching errors
- Update .kokoro/dashboard.sh to run correct maven goals (test/validate) based on JOB_TYPE. - Include first-party-dependencies and third-party-dependencies in GHA pre-install cache steps to prevent resolution failures of snapshot BOMs.
1 parent 6e0e0f4 commit 2e6328e

3 files changed

Lines changed: 28 additions & 4 deletions

File tree

‎.github/workflows/java-cloud-bom-bom-content-test.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ jobs:
4040
grep -q "<packaging>pom</packaging>" "$f" && echo "$f"
4141
done | sed 's|^\./||' | sed 's|/pom.xml$||'
4242
echo "sdk-platform-java/java-shared-dependencies"
43+
echo "sdk-platform-java/java-shared-dependencies/first-party-dependencies"
44+
echo "sdk-platform-java/java-shared-dependencies/third-party-dependencies"
4345
) | tr '\n' ',' | sed 's/,$//' > bom_projects.txt
4446
mvn install -pl $(cat bom_projects.txt) -am -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V -q
4547
rm bom_projects.txt
@@ -76,6 +78,8 @@ jobs:
7678
grep -q "<packaging>pom</packaging>" "$f" && echo "$f"
7779
done | sed 's|^\./||' | sed 's|/pom.xml$||'
7880
echo "sdk-platform-java/java-shared-dependencies"
81+
echo "sdk-platform-java/java-shared-dependencies/first-party-dependencies"
82+
echo "sdk-platform-java/java-shared-dependencies/third-party-dependencies"
7983
) | tr '\n' ',' | sed 's/,$//' > bom_projects.txt
8084
mvn install -pl $(cat bom_projects.txt) -am -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V -q
8185
rm bom_projects.txt

‎.github/workflows/java-cloud-bom-ci.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ jobs:
5858
grep -q "<packaging>pom</packaging>" "$f" && echo "$f"
5959
done | sed 's|^\./||' | sed 's|/pom.xml$||'
6060
echo "sdk-platform-java/java-shared-dependencies"
61+
echo "sdk-platform-java/java-shared-dependencies/first-party-dependencies"
62+
echo "sdk-platform-java/java-shared-dependencies/third-party-dependencies"
6163
) | tr '\n' ',' | sed 's/,$//' > bom_projects.txt
6264
mvn install -pl $(cat bom_projects.txt) -am -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V -q
6365
rm bom_projects.txt
@@ -94,6 +96,8 @@ jobs:
9496
grep -q "<packaging>pom</packaging>" "$f" && echo "$f"
9597
done | sed 's|^\./||' | sed 's|/pom.xml$||'
9698
echo "sdk-platform-java/java-shared-dependencies"
99+
echo "sdk-platform-java/java-shared-dependencies/first-party-dependencies"
100+
echo "sdk-platform-java/java-shared-dependencies/third-party-dependencies"
97101
) | tr '\n' ',' | sed 's/,$//' > bom_projects.txt
98102
mvn install -pl $(cat bom_projects.txt) -am -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V -q
99103
rm bom_projects.txt
@@ -122,6 +126,8 @@ jobs:
122126
grep -q "<packaging>pom</packaging>" "$f" && echo "$f"
123127
done | sed 's|^\./||' | sed 's|/pom.xml$||'
124128
echo "sdk-platform-java/java-shared-dependencies"
129+
echo "sdk-platform-java/java-shared-dependencies/first-party-dependencies"
130+
echo "sdk-platform-java/java-shared-dependencies/third-party-dependencies"
125131
) | tr '\n' ',' | sed 's/,$//' > bom_projects.txt
126132
mvn install -pl $(cat bom_projects.txt) -am -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V -q
127133
rm bom_projects.txt
@@ -151,6 +157,8 @@ jobs:
151157
grep -q "<packaging>pom</packaging>" "$f" && echo "$f"
152158
done | sed 's|^\./||' | sed 's|/pom.xml$||'
153159
echo "sdk-platform-java/java-shared-dependencies"
160+
echo "sdk-platform-java/java-shared-dependencies/first-party-dependencies"
161+
echo "sdk-platform-java/java-shared-dependencies/third-party-dependencies"
154162
) | tr '\n' ',' | sed 's/,$//' > bom_projects.txt
155163
mvn install -pl $(cat bom_projects.txt) -am -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V -q
156164
rm bom_projects.txt
@@ -174,6 +182,8 @@ jobs:
174182
grep -q "<packaging>pom</packaging>" "$f" && echo "$f"
175183
done | sed 's|^\./||' | sed 's|/pom.xml$||'
176184
echo "sdk-platform-java/java-shared-dependencies"
185+
echo "sdk-platform-java/java-shared-dependencies/first-party-dependencies"
186+
echo "sdk-platform-java/java-shared-dependencies/third-party-dependencies"
177187
) | tr '\n' ',' | sed 's/,$//' > bom_projects.txt
178188
mvn install -pl $(cat bom_projects.txt) -am -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V -q
179189
rm bom_projects.txt
@@ -201,6 +211,8 @@ jobs:
201211
grep -q "<packaging>pom</packaging>" "$f" && echo "$f"
202212
done | sed 's|^\./||' | sed 's|/pom.xml$||'
203213
echo "sdk-platform-java/java-shared-dependencies"
214+
echo "sdk-platform-java/java-shared-dependencies/first-party-dependencies"
215+
echo "sdk-platform-java/java-shared-dependencies/third-party-dependencies"
204216
) | tr '\n' ',' | sed 's/,$//' > bom_projects.txt
205217
mvn install -pl $(cat bom_projects.txt) -am -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V -q
206218
rm bom_projects.txt

‎.kokoro/dashboard.sh‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,16 @@ scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
1919
cd ${scriptDir}/..
2020

2121
outputFile="$scriptDir/../java-cloud-bom/dashboard/target/tmp/output.txt"
22-
cd java-cloud-bom/dashboard/
2322

24-
echo -e "\n******************** BUILDING THE DASHBOARD ********************"
25-
26-
mvn --fail-at-end
23+
if [[ "${JOB_TYPE}" == "dashboard-units-check" ]]; then
24+
cd java-cloud-bom/dashboard/
25+
echo -e "\n******************** BUILDING THE DASHBOARD ********************"
26+
mvn test --fail-at-end
27+
elif [[ "${JOB_TYPE}" == "dependency-convergence-check" ]]; then
28+
cd java-cloud-bom/tests/dependency-convergence/
29+
echo -e "\n******************** RUNNING DEPENDENCY CONVERGENCE CHECK ********************"
30+
mvn validate --fail-at-end
31+
else
32+
echo "Unknown JOB_TYPE: ${JOB_TYPE}"
33+
exit 1
34+
fi

0 commit comments

Comments
 (0)