aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Monteith <stuart.monteith@linaro.org>2017-03-29 11:08:06 +0100
committerStuart Monteith <stuart.monteith@linaro.org>2017-03-29 11:10:04 +0100
commitdbb51aa904c5e864e7cdab9a279e0f27781ba489 (patch)
treeabcab80523844af600d3a1c24e7d861d72796fa6
parentc261c1d39cde7cc9ef391db051d456fbfde2c511 (diff)
downloadconfigs-dbb51aa904c5e864e7cdab9a279e0f27781ba489.tar.gz
jdk: Fix jcstress paths, compress results
The jcstress testsuite generates a results file with a new file name. The cp command to copy this file was failing. Compress the jcstress tests results. Before this change, the output was suffixed with gz, but wasn't actually gzipped. Change-Id: Ifd034150a6dbd38ff5294694c4b94cfc6a23c4d1
-rw-r--r--jdk8-jcstress-test-persist-results.yaml2
-rw-r--r--jdk8-jcstress-test.yaml4
-rw-r--r--jdk9-jcstress-test-persist-results.yaml2
-rw-r--r--jdk9-jcstress-test.yaml4
4 files changed, 6 insertions, 6 deletions
diff --git a/jdk8-jcstress-test-persist-results.yaml b/jdk8-jcstress-test-persist-results.yaml
index c1d424304..d6bc1b430 100644
--- a/jdk8-jcstress-test-persist-results.yaml
+++ b/jdk8-jcstress-test-persist-results.yaml
@@ -88,7 +88,7 @@
fi
mkdir -p ${JCSTRESS_RESULTS_DIR} ${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR}
- tar -C ${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR} --strip-components=1 -xf incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/jcstress-results-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz
+ tar -C ${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR} --strip-components=1 -xzf incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/jcstress-results-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz
numeric_date=$(date +'%s' --date=$(date +'%Y-%m-%d'))
echo "Previous Results"
cat ${RESULTS_CSV}
diff --git a/jdk8-jcstress-test.yaml b/jdk8-jcstress-test.yaml
index 6dafb8988..ffbdd2776 100644
--- a/jdk8-jcstress-test.yaml
+++ b/jdk8-jcstress-test.yaml
@@ -98,10 +98,10 @@
rm -rf ${out_dirname}
mkdir -p ${out_dirname}
- cp jcstress.* ${out_dirname}
+ cp jcstress-results*.bin.gz ${out_dirname}
cp -a results ${out_dirname}
- tar cvf out/${out_dirname}.tar.gz ${out_dirname}
+ tar czvf out/${out_dirname}.tar.gz ${out_dirname}
publishers:
- archive:
artifacts: 'out/jcstress-results-*.tar.gz'
diff --git a/jdk9-jcstress-test-persist-results.yaml b/jdk9-jcstress-test-persist-results.yaml
index 96cb5c626..6e61e1d6c 100644
--- a/jdk9-jcstress-test-persist-results.yaml
+++ b/jdk9-jcstress-test-persist-results.yaml
@@ -88,7 +88,7 @@
fi
mkdir -p ${JCSTRESS_RESULTS_DIR} ${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR}
- tar -C ${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR} --strip-components=1 -xf incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/jcstress-results-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz
+ tar -C ${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR} --strip-components=1 -xzf incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/jcstress-results-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz
numeric_date=$(date +'%s' --date=$(date +'%Y-%m-%d'))
echo "Previous Results"
cat ${RESULTS_CSV}
diff --git a/jdk9-jcstress-test.yaml b/jdk9-jcstress-test.yaml
index 8092da5fe..c1b635aee 100644
--- a/jdk9-jcstress-test.yaml
+++ b/jdk9-jcstress-test.yaml
@@ -98,10 +98,10 @@
rm -rf ${out_dirname}
mkdir -p ${out_dirname}
- cp jcstress.* ${out_dirname}
+ cp jcstress-results*.bin.gz ${out_dirname}
cp -a results ${out_dirname}
- tar cvf out/${out_dirname}.tar.gz ${out_dirname}
+ tar czvf out/${out_dirname}.tar.gz ${out_dirname}
publishers:
- archive:
artifacts: 'out/jcstress-results-*.tar.gz'