aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--jdk8-jtreg-test-publish-results.yaml6
-rw-r--r--jdk8-jtreg-test.yaml2
2 files changed, 4 insertions, 4 deletions
diff --git a/jdk8-jtreg-test-publish-results.yaml b/jdk8-jtreg-test-publish-results.yaml
index 17529b4d31..b88aacb7f8 100644
--- a/jdk8-jtreg-test-publish-results.yaml
+++ b/jdk8-jtreg-test-publish-results.yaml
@@ -96,7 +96,8 @@
PERSIST=$HOME/srv/openjdk
SCRIPT_DIR=$PERSIST/openjdk-test-scripts
- tree $PERSIST | xz >$WORKSPACE/tree.out.xz
+ env >$WORKSPACE/env.out
+ tree -fd -L5 $PERSIST | xz >$WORKSPACE/tree.out.xz
if [ -d $SCRIPT_DIR ]; then
(cd $SCRIPT_DIR; git pull)
@@ -107,10 +108,9 @@
tar xf jtreg-build-4.2.0-SNAPSHOT.tar.xz
export PATH=${WORKSPACE}/jtreg/bin:$PATH
which jtdiff
- env
TOP_DIR=$PERSIST/openjdk8-jtreg-nightly-tests bash -x $SCRIPT_DIR/publish $PUBLISH_DEST $NODE_NAME
publishers:
- archive:
- artifacts: 'tree.out.xz'
+ artifacts: 'tree.out.xz, env.out'
- email:
recipients: 'fathi.boudra@linaro.org stuart.monteith@linaro.org'
diff --git a/jdk8-jtreg-test.yaml b/jdk8-jtreg-test.yaml
index 0b9fb5d908..82f4e6650a 100644
--- a/jdk8-jtreg-test.yaml
+++ b/jdk8-jtreg-test.yaml
@@ -183,7 +183,7 @@
mkdir -p out
tar -C ${basedir} --show-transformed-names -acvf out/jtreg-results-${JTREG_CATEGORY}-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz builds reports
rm -rf ${new_basedir}/src
- mv -v ${basedir}/src ${new_basedir}/src
+ mv -v ${basedir}/src ${new_basedir}
publishers:
- archive:
artifacts: 'out/jtreg-results-${JTREG_CATEGORY}-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz'