X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=.jjb-test%2Fexpected-xml%2Fgithub-maven-maven-merge-master;h=5fafbace5ae02cbf72e755e9d0c032c69ae8b397;hb=refs%2Fchanges%2F91%2F8391%2F1;hp=f875d8aa5963697a1f09cc8e41e56dc1c602e965;hpb=92c2494543e0e66bfe8cd636efdf8cc618a03b62;p=releng%2Fglobal-jjb.git
diff --git a/.jjb-test/expected-xml/github-maven-maven-merge-master b/.jjb-test/expected-xml/github-maven-maven-merge-master
index f875d8aa..5fafbace 100644
--- a/.jjb-test/expected-xml/github-maven-maven-merge-master
+++ b/.jjb-test/expected-xml/github-maven-maven-merge-master
@@ -10,8 +10,9 @@
build-vm
false
-
+
$GIT_URL/$PROJECT/example-org/releng/ciman
+
@@ -120,28 +121,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
master
-
-
false
- false
- true
- false
false
Default
-
- true
-
- false
- false
+
+
+
false
true
false
+ false
10
@@ -155,8 +150,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
false
+
+
^remerge$
+
false
true
true
@@ -423,7 +421,7 @@ $MVN clean deploy \
--global-settings "$GLOBAL_SETTINGS_FILE" \
--settings "$SETTINGS_FILE" \
-DaltDeploymentRepository=staging::default::file:"$WORKSPACE"/m2repo \
- $MAVEN_PARAMS $MAVEN_OPTIONS
+ $MAVEN_OPTIONS $MAVEN_PARAMS
#!/bin/bash
# SPDX-License-Identifier: EPL-1.0
@@ -449,8 +447,9 @@ nexus_repo_url="$NEXUS_URL/content/repositories/$NEXUS_REPO"
# Remove metadata files that were not updated.
set +e # Temporarily disable to run diff command.
-metadata_files=($(diff -s -r "$m2repo_dir" "$WORKSPACE/m2repo-backup" \
- | grep 'Files .* and .* are identical' | awk '{print $2}'))
+IFS=" " read -r -a metadata_files <<< "$(diff -s -r "$m2repo_dir" "$WORKSPACE/m2repo-backup" \
+ | grep 'Files .* and .* are identical' \
+ | awk '{print $2}')"
set -e # Re-enable.
set +u # $metadata_files could be unbound if project is new.
@@ -511,11 +510,11 @@ exit 0
false
-
+
**/**.exec
**/classes
**/src/main/java
-
+ false
**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**
10
@@ -562,9 +561,9 @@ SAR_DIR="$WORKSPACE/archives/sar-reports"
mkdir -p "$SAR_DIR"
cp "$SYSSTAT_PATH/"* "$_"
# convert sar data to ascii format
-while IFS="" read -r s
+while IFS="" read -r sarfilenum
do
- [ -f "$s" ] && LC_TIME=POSIX sar -A -f "$s" > "$SAR_DIR/sar${s//[!0-9]/}"
+ [ -f "$sarfilenum" ] && LC_TIME=POSIX sar -A -f "$sarfilenum" > "$SAR_DIR/sar${sarfilenum//[!0-9]/}"
done < <(find "$SYSSTAT_PATH" -name "sa[0-9]*" || true)
# DON'T fail build if script fails.