X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;ds=sidebyside;f=.jjb-test%2Fexpected-xml%2Fgithub-rtd-rtd-merge-master;h=943ab357d9d058284cd87d4769144b71d1eacd49;hb=refs%2Fchanges%2F89%2F8389%2F1;hp=9c401033d5ef511b98bda234945875d4199d4680;hpb=6df0d5a717c1e3c33aae618b80382b491476cd54;p=releng%2Fglobal-jjb.git
diff --git a/.jjb-test/expected-xml/github-rtd-rtd-merge-master b/.jjb-test/expected-xml/github-rtd-rtd-merge-master
index 9c401033..943ab357 100644
--- a/.jjb-test/expected-xml/github-rtd-rtd-merge-master
+++ b/.jjb-test/expected-xml/github-rtd-rtd-merge-master
@@ -9,8 +9,9 @@
build-vm
false
-
+
https://github.com/example-org/releng/ciman
+
@@ -79,8 +80,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
false
+
+
^remerge$
+
false
true
true
@@ -164,9 +168,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.
@@ -213,7 +217,7 @@ machine=$(echo "$NEXUS_URL" | awk -F/ '{print $3}')
user=$(echo "$CREDENTIAL" | cut -f1 -d:)
pass=$(echo "$CREDENTIAL" | cut -f2 -d:)
-echo "machine $machine login $user password $pass" > ~/.netrc
+echo "machine ${machine%:*} login $user password $pass" > ~/.netrc
@@ -401,5 +405,14 @@ rm ~/.netrc
test-credential
+
+
+
+ npmrc
+ $HOME/.npmrc
+
+
+
+