X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=.jjb-test%2Fexpected-xml%2Fgerrit-maven-maven-verify-deps-master-mvn33-openjdk8;h=1db41869726506625d652833248e3bedce1066de;hb=8bacaf67000180245721363de6f699c32ee5da35;hp=7672c45fe51ab18ea16674078356e241c0f733f4;hpb=3577c6f3469752c9ff64742002a5b235d774001b;p=releng%2Fglobal-jjb.git
diff --git a/.jjb-test/expected-xml/gerrit-maven-maven-verify-deps-master-mvn33-openjdk8 b/.jjb-test/expected-xml/gerrit-maven-maven-verify-deps-master-mvn33-openjdk8
index 7672c45f..1db41869 100644
--- a/.jjb-test/expected-xml/gerrit-maven-maven-verify-deps-master-mvn33-openjdk8
+++ b/.jjb-test/expected-xml/gerrit-maven-maven-verify-deps-master-mvn33-openjdk8
@@ -102,6 +102,11 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
uuddlrlrba
+
+ ARCHIVE_ARTIFACTS
+ Artifacts to archive to the logs server.
+
+
@@ -120,28 +125,22 @@ For example '<1.0.0' or '>=1.0.0,<2.0.0'.
refs/heads/$GERRIT_BRANCH
-
-
false
- false
- true
- false
false
Default
-
- true
-
- false
- false
+
+
+
false
true
false
+ false
10
@@ -258,7 +257,18 @@ set -eu -o pipefail
REPOS_DIR="$WORKSPACE/.repos"
-PATCHES=($(echo "$GERRIT_EVENT_COMMENT_TEXT" | grep 'recheck:' | awk -F: '{print $2}'))
+IFS=" " read -r -a PATCHES <<< "$(echo "$GERRIT_EVENT_COMMENT_TEXT" | grep 'recheck:' | awk -F: '{print $2}')"
+
+# Workaround for git-review bug in v1.24
+# https://storyboard.openstack.org/#!/story/2001081
+set +u # Allow unbound variables for virtualenv
+virtualenv --quiet "/tmp/v/git-review"
+# shellcheck source=/tmp/v/git-review/bin/activate disable=SC1091
+source "/tmp/v/git-review/bin/activate"
+pip install --quiet --upgrade pip
+pip install --quiet --upgrade git-review
+set -u
+# End git-review workaround
projects=()
for patch in $(echo "${PATCHES[@]}"); do
@@ -274,7 +284,10 @@ for patch in $(echo "${PATCHES[@]}"); do
fi
pushd "$REPOS_DIR/$project"
- git remote add gerrit "$GIT_URL/$project"
+ # If remote gerrit already exists just make sure path is expected
+ if ! git remote add gerrit "$GERRIT_URL/$project" > /dev/null 2>&1; then
+ git remote set-url gerrit "$GERRIT_URL/$project"
+ fi
git review --cherrypick="$patch"
popd
done
@@ -335,7 +348,7 @@ echo "$MAVEN_OPTIONS"
set -e -o pipefail
set +u
-PROJECTS=($(echo "$DEPENDENCY_BUILD_ORDER"))
+IFS=" " read -r -a PROJECTS <<< "$DEPENDENCY_BUILD_ORDER"
REPOS_DIR="$WORKSPACE/.repos"
export MAVEN_OPTS
@@ -349,7 +362,7 @@ for project in "${PROJECTS[@]}"; do
-DskipTests=true \
--global-settings "$GLOBAL_SETTINGS_FILE" \
--settings "$SETTINGS_FILE" \
- $MAVEN_PARAMS $MAVEN_OPTIONS
+ $MAVEN_OPTIONS $MAVEN_PARAMS
popd
done
@@ -405,7 +418,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
@@ -453,11 +466,11 @@ exit 0
false
-
+
**/**.exec
**/classes
**/src/main/java
-
+ false
**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**
10
@@ -504,9 +517,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.
@@ -741,5 +754,14 @@ rm ~/.netrc
test-credential
+
+
+
+ npmrc
+ $HOME/.npmrc
+
+
+
+