From 43a2344277f70530c1ab56d943547707329abae0 Mon Sep 17 00:00:00 2001 From: hyokeun Date: Thu, 27 Apr 2017 15:04:49 +0900 Subject: [PATCH] Use separate mic.conf file for each build This patch will be affected if below review is merged. Otherwise no effect. https://review.tizen.org/gerrit/#/c/127355/ Change-Id: Ie19a0197881be19473700d38e519e0bab1c1fdc3 --- jobs/image-creator/config.xml | 13 +++++++++++-- jobs/pre-release-image-creator/config.xml | 13 +++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/jobs/image-creator/config.xml b/jobs/image-creator/config.xml index c8779b3..1eba266 100755 --- a/jobs/image-creator/config.xml +++ b/jobs/image-creator/config.xml @@ -44,7 +44,16 @@ #/bin/bash -python ${WORKSPACE}/jenkins-scripts/job_imager.py +export MIC_WORK_DIR=/var/tmp/mic_$BUILD_NUMBER +export MIC_CONF_FILE=$MIC_WORK_DIR/mic.conf +mkdir -p $MIC_WORK_DIR +cp /etc/mic/mic.conf $MIC_CONF_FILE +sed -i "s|^tmpdir= /var/tmp/mic|tmpdir= $MIC_WORK_DIR|g" $MIC_CONF_FILE +sed -i "s|^cachedir= /var/tmp/mic/cache|cachedir= $MIC_WORK_DIR/cache|g" $MIC_CONF_FILE +sed -i "s|^rootdir=/var/tmp/mic-bootstrap|rootdir= $MIC_WORK_DIR/mic-bootstrap|g" $MIC_CONF_FILE + +python ${WORKSPACE}/jenkins-scripts/job_imager.py + @@ -127,4 +136,4 @@ if(name?.matches() && build?.matches()) { - \ No newline at end of file + diff --git a/jobs/pre-release-image-creator/config.xml b/jobs/pre-release-image-creator/config.xml index 511d64c..7105fcf 100644 --- a/jobs/pre-release-image-creator/config.xml +++ b/jobs/pre-release-image-creator/config.xml @@ -44,7 +44,16 @@ #/bin/bash -python ${WORKSPACE}/jenkins-scripts/job_imager.py +export MIC_WORK_DIR=/var/tmp/mic_$BUILD_NUMBER +export MIC_CONF_FILE=$MIC_WORK_DIR/mic.conf +mkdir -p $MIC_WORK_DIR +cp /etc/mic/mic.conf $MIC_CONF_FILE +sed -i "s|^tmpdir= /var/tmp/mic|tmpdir= $MIC_WORK_DIR|g" $MIC_CONF_FILE +sed -i "s|^cachedir= /var/tmp/mic/cache|cachedir= $MIC_WORK_DIR/cache|g" $MIC_CONF_FILE +sed -i "s|^rootdir=/var/tmp/mic-bootstrap|rootdir= $MIC_WORK_DIR/mic-bootstrap|g" $MIC_CONF_FILE + +python ${WORKSPACE}/jenkins-scripts/job_imager.py + @@ -127,4 +136,4 @@ if(name?.matches() && build?.matches()) { - \ No newline at end of file + -- 2.7.4