From 6da9b421508867c7170e3b6c2640b7c72d2e792c Mon Sep 17 00:00:00 2001 From: Stuart Monteith Date: Tue, 18 Oct 2016 19:00:10 +0100 Subject: jdk: Move src directory to the correct location There is something missing from the scripts that stops the src directory from being moved into the correct location. This hopefully fixes that by moving the src directory into the correct year/day_of_year path. In principle, we could add the src to the results tar.gz file - that would inflate the files stored by jenkins. Change-Id: Iaffd9d8c70dc5ba6b22513c2948ad6218c128446 --- jdk8-jtreg-test.yaml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'jdk8-jtreg-test.yaml') diff --git a/jdk8-jtreg-test.yaml b/jdk8-jtreg-test.yaml index 82f4e6650a..362b01077d 100644 --- a/jdk8-jtreg-test.yaml +++ b/jdk8-jtreg-test.yaml @@ -117,8 +117,6 @@ YEAR=XXX__YEAR__XXX DAY_OF_YEAR=YYY__DAY_OF_YEAR__YYY - new_basedir=$PERSIST/openjdk8-jtreg-nightly-tests - basedir=cron_output mkdir -p ${basedir}/{src,builds,reports} @@ -182,8 +180,18 @@ 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} + + # Move src directory to correct location for publishing. + # Only needs to be done once, as this runs 3 times for each JTREG + # category. + : ${NEW_YEAR:=$(date +%Y)} + : ${NEW_DAY_OF_YEAR:=$(date +%j)} + new_basedir=$PERSIST/openjdk8-jtreg-nightly-tests + new_srcdir=${new_basedir}/src/${NEW_YEAR}/${NEW_DAY_OF_YEAR} + if [ ! -d ${new_srcdir} ]; then + mkdir -p ${new_srcdir} + mv ${src_dir} ${new_srcdir} + fi publishers: - archive: artifacts: 'out/jtreg-results-${JTREG_CATEGORY}-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz' -- cgit v1.2.3