Skip to content

fix(build): update surefire report processing to handle time format #2962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
liferoad merged 6 commits into from
Nov 5, 2025
Merged

fix(build): update surefire report processing to handle time format #2962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0224075
fix(build): update surefire report processing to handle time format a…
liferoad Nov 4, 2025
07bf611
check import jsonschema
liferoad Nov 5, 2025
cfa2f30
use python
liferoad Nov 5, 2025
55f2d45
use python3
liferoad Nov 5, 2025
19ce685
disable cache
liferoad Nov 5, 2025
bf558c6
fixed the dockerfile
liferoad Nov 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions plugins/core-plugin/src/main/resources/Dockerfile-template-yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@ COPY --from=python-base /root/.apache_beam/cache /root/.apache_beam/cache
# Copy licenses
COPY --from=python-base /usr/licenses/ /usr/licenses/

# Test jsonschema
RUN python -c "import jsonschema"

WORKDIR /template

ENTRYPOINT ${entryPoint}
42 changes: 21 additions & 21 deletions ...maven-plugin/src/main/java/com/google/cloud/teleport/plugin/maven/TemplatesStageMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1085,7 +1085,7 @@ private void stageYamlUsingDockerfile(

File cloudbuildFile = File.createTempFile("cloudbuild", ".yaml");
try (FileWriter writer = new FileWriter(cloudbuildFile)) {
String cacheFolder = imagePathTag.substring(0, imagePathTag.lastIndexOf('/')) + "/cache";
// String cacheFolder = imagePathTag.substring(0, imagePathTag.lastIndexOf('/')) + "/cache";
String tarPath = "/workspace/" + yamlTemplateName + ".tar\n";
writer.write(
"steps:\n"
Expand All @@ -1097,12 +1097,12 @@ private void stageYamlUsingDockerfile(
+ " - --dockerfile="
+ dockerfile
+ "\n"
+ " - --cache=true\n"
+ " - --cache-ttl=6h\n"
+ " - --compressed-caching=false\n"
+ " - --cache-copy-layers=true\n"
+ " - --cache-repo="
+ cacheFolder
// + " - --cache=true\n"
// + " - --cache-ttl=6h\n"
// + " - --compressed-caching=false\n"
// + " - --cache-copy-layers=true\n"
// + " - --cache-repo="
// + cacheFolder
+ (generateSBOM
? "\n"
+ " - --no-push\n"
Expand Down Expand Up @@ -1159,7 +1159,7 @@ private void stagePythonUsingDockerfile(

File cloudbuildFile = File.createTempFile("cloudbuild", ".yaml");
try (FileWriter writer = new FileWriter(cloudbuildFile)) {
String cacheFolder = imagePathTag.substring(0, imagePathTag.lastIndexOf('/')) + "/cache";
// String cacheFolder = imagePathTag.substring(0, imagePathTag.lastIndexOf('/')) + "/cache";
String tarPath = "/workspace/" + containerName + ".tar\n";
writer.write(
"steps:\n"
Expand All @@ -1168,12 +1168,12 @@ private void stagePythonUsingDockerfile(
+ " - --destination="
+ imagePathTag
+ "\n"
+ " - --cache=true\n"
+ " - --cache-ttl=6h\n"
+ " - --compressed-caching=false\n"
+ " - --cache-copy-layers=true\n"
+ " - --cache-repo="
+ cacheFolder
// + " - --cache=true\n"
// + " - --cache-ttl=6h\n"
// + " - --compressed-caching=false\n"
// + " - --cache-copy-layers=true\n"
// + " - --cache-repo="
// + cacheFolder
+ (generateSBOM
? "\n"
+ " - --no-push\n"
Expand Down Expand Up @@ -1310,7 +1310,7 @@ private void stageXlangUsingDockerfile(
File cloudbuildFile = File.createTempFile("cloudbuild", ".yaml");
String tarPath = "/workspace/" + containerName + ".tar\n";
try (FileWriter writer = new FileWriter(cloudbuildFile)) {
String cacheFolder = imagePathTag.substring(0, imagePathTag.lastIndexOf('/')) + "/cache";
// String cacheFolder = imagePathTag.substring(0, imagePathTag.lastIndexOf('/')) + "/cache";
writer.write(
"steps:\n"
+ "- name: gcr.io/kaniko-project/executor\n"
Expand All @@ -1321,12 +1321,12 @@ private void stageXlangUsingDockerfile(
+ " - --dockerfile="
+ dockerfile
+ "\n"
+ " - --cache=true\n"
+ " - --cache-ttl=6h\n"
+ " - --compressed-caching=false\n"
+ " - --cache-copy-layers=true\n"
+ " - --cache-repo="
+ cacheFolder
// + " - --cache=true\n"
// + " - --cache-ttl=6h\n"
// + " - --compressed-caching=false\n"
// + " - --cache-copy-layers=true\n"
// + " - --cache-repo="
// + cacheFolder
+ (generateSBOM
? "\n"
+ " - --no-push\n"
Expand Down
6 changes: 5 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@
<executable>bash</executable>
<arguments>
<argument>-c</argument>
<argument>find . -name "TEST-*.xml" -path "*/target/surefire-reports/*" -exec sed -i.bak 's/time="\([0-9]*\),\([0-9]*\.*[0-9]*\)"/time="\1\2"/g' {} \;</argument>
<argument>find . -name "TEST-*.xml" -path "*/target/surefire-reports/*" -exec sed -E -i.bak -e ':a' -e 's/(time="[^\"]*),/\1/g' -e 'ta' {} \; || true</argument>
</arguments>
</configuration>
</execution>
Expand Down Expand Up @@ -559,6 +559,10 @@
<goals>
<goal>report-only</goal>
</goals>
<configuration>
<!-- If report generation encounters parsing issues, skip to avoid failing the build -->
<skipSurefireReport>true</skipSurefireReport>
</configuration>
</execution>
</executions>
</plugin>
Expand Down
Loading