If TMP_DIR is set look there for artifacts to publish, rather than a tmp
directory which is a child of basedir.
Signed-off-by: Joshua Lock <joshua.l...@collabora.co.uk>
---
.../autobuilder/buildsteps/PublishArtifacts.py | 39 ++++++++++++----------
1 file changed, 21 insertions(+), 18 deletions(-)
diff --git
a/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py
b/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py
index e636fe5..aee3d1f 100644
--- a/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py
+++ b/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py
@@ -47,6 +47,9 @@ class PublishArtifacts(ShellCommand):
self.basedir=os.path.join(os.path.join(
self.workerdir, buildername),
"build/build/")
+ self.tmpdir = os.environ.get("TMP_DIR")
+ if self.tmpdir is None:
+ self.tmpdir = os.path.join(self.basedir, "tmp")
command=""
DATESTAMP=datetime.datetime.now().strftime("%Y%m%d")
if str(os.environ.get('PUBLISH_BUILDS')) == "True":
@@ -72,17 +75,17 @@ class PublishArtifacts(ShellCommand):
if artifact == "adt-installer":
command=command+"mkdir -p " + os.path.join(DEST,
ADT_INST_PUBLISH_DIR) + ";"
command=command+"cp -R --no-dereference --preserve=links "
+ \
- os.path.join(self.basedir,
"tmp/deploy/sdk/") + \
+ os.path.join(self.tmpdir, "deploy/sdk/") +
\
"*adt* " + os.path.join(DEST,
ADT_INST_PUBLISH_DIR) + ";"
elif artifact == "adt-installer-QA":
command=command+"mkdir -p " + os.path.join(DEST,
ADTQA_INST_PUBLISH_DIR) + ";"
command=command+"cp -R --no-dereference --preserve=links "
+ \
- os.path.join(self.basedir,
"tmp/deploy/sdk/") + \
+ os.path.join(self.tmpdir, "deploy/sdk/") +
\
"*adt* " + os.path.join(DEST,
ADTQA_INST_PUBLISH_DIR)+ ";"
elif artifact == "adtrepo-dev":
adt_dev_dest= os.environ.get("ADTREPO_DEV_PATH") + "/" +
distroversion + "-" + got_revision_poky + '-' + self.getProperty("branch_poky")
command=command+"mkdir -p " + adt_dev_dest + "/adt-ipk;"
- command=command+"rsync -av " + os.path.join(self.basedir,
"tmp/deploy/ipk/") + " " + adt_dev_dest + "/adt-ipk;"
+ command=command+"rsync -av " + os.path.join(self.tmpdir,
"deploy/ipk/") + " " + adt_dev_dest + "/adt-ipk;"
command=command+"rm -rf " + adt_dev_dest + "/rootfs; mkdir
-p " + adt_dev_dest + "/rootfs;"
command=command+"for x in `ls " + DEST +
"/machines/qemu/|grep -v tiny`; do ln -s " + DEST + "/machines/qemu/$x " +
adt_dev_dest + "/rootfs/$x; done;"
if self.layerversion_yocto is not None and
int(self.layerversion_yocto) < 2:
@@ -98,49 +101,49 @@ class PublishArtifacts(ShellCommand):
command=command+"mkdir -p " + DEST + "/" + BA_PUBLISH_DIR
+ ";"
if self.layerversion_core is not None and
int(self.layerversion_core) > 2:
command=command+"cp -R --no-dereference
--preserve=links " + \
- os.path.join(self.basedir,
"tmp/deploy/images/qemux86-64/*.zip") + \
+ os.path.join(self.tmpdir,
"deploy/images/qemux86-64/*.zip") + \
" " + DEST + "/" + BA_PUBLISH_DIR + ";"
else:
command=command+"cp -R --no-dereference
--preserve=links " + \
- os.path.join(self.basedir,
"tmp/deploy/images/*.zip") + \
+ os.path.join(self.tmpdir,
"deploy/images/*.zip") + \
" " + DEST + "/" + BA_PUBLISH_DIR + ";"
elif artifact == "buildtools-tarball":
command=command+"mkdir -p " + DEST + "/buildtools;"
command=command+"cp -R --no-dereference --preserve=links "
+ \
- os.path.join(self.basedir,
"tmp/deploy/sdk/*.sh") + \
+ os.path.join(self.tmpdir,
"deploy/sdk/*.sh") + \
" " + DEST + "/buildtools;"
elif artifact == "rpm":
command=command+"mkdir -p " + os.path.join(DEST,
RPM_PUBLISH_DIR) + ";"
command=command+"cp -R --no-dereference --preserve=links "
+ \
- os.path.join(self.basedir,
"tmp/deploy/rpm/* ") + \
+ os.path.join(self.tmpdir, "deploy/rpm/* ")
+ \
os.path.join(DEST, RPM_PUBLISH_DIR) + ";"
elif artifact == "deb":
command=command+"mkdir -p " + os.path.join(DEST,
DEB_PUBLISH_DIR) + ";"
command=command+"cp -R --no-dereference --preserve=links "
+ \
- os.path.join(self.basedir,
"tmp/deploy/deb/* ") + \
+ os.path.join(self.tmpdir, "deploy/deb/* ")
+ \
os.path.join(DEST, DEB_PUBLISH_DIR) + ";"
elif artifact == "ipk":
command=command+"mkdir -p " + os.path.join(DEST,
IPK_PUBLISH_DIR) + ";"
command=command+"cp -R --no-dereference --preserve=links "
+ \
- os.path.join(self.basedir,
"tmp/deploy/ipk/* ") + \
+ os.path.join(self.tmpdir, "deploy/ipk/* ")
+ \
os.path.join(DEST, IPK_PUBLISH_DIR) + ";"
elif artifact == "toolchain":
command=command+"mkdir -p " + os.path.join(DEST,
X86TC_PUBLISH_DIR) + ";"
command=command+"cp -R --no-dereference --preserve=links "
+ \
- os.path.join(self.basedir,
"tmp/deploy/sdk/poky-*i686-core-image*.sh ") + \
+ os.path.join(self.tmpdir,
"deploy/sdk/poky-*i686-core-image*.sh ") + \
os.path.join(DEST, X86TC_PUBLISH_DIR) + ";"
command=command+"mkdir -p " + os.path.join(DEST,
X8664TC_PUBLISH_DIR) + ";"
command=command+"cp -R --no-dereference --preserve=links "
+ \
- os.path.join(self.basedir,
"tmp/deploy/sdk/poky-*x86_64-core-image*.sh ") + \
+ os.path.join(self.tmpdir,
"deploy/sdk/poky-*x86_64-core-image*.sh ") + \
os.path.join(DEST, X8664TC_PUBLISH_DIR) +
";"
elif artifact == "oe-toolchain":
command=command+"mkdir -p " + os.path.join(DEST,
X86TC_PUBLISH_DIR) + ";"
command=command+"cp -R --no-dereference --preserve=links "
+ \
- os.path.join(self.basedir,
"tmp/deploy/sdk/oecore-i686* ") + \
+ os.path.join(self.tmpdir,
"deploy/sdk/oecore-i686* ") + \
os.path.join(DEST, X86TC_PUBLISH_DIR) + ";"
command=command+"mkdir -p " + os.path.join(DEST,
X8664TC_PUBLISH_DIR) + ";"
command=command+"cp -R --no-dereference --preserve=links "
+ \
- os.path.join(self.basedir,
"tmp/deploy/sdk/oecore-x86_64* ") + \
+ os.path.join(self.tmpdir,
"deploy/sdk/oecore-x86_64* ") + \
os.path.join(DEST, X8664TC_PUBLISH_DIR) +
";"
elif "qemu" in artifact:
@@ -162,11 +165,11 @@ class PublishArtifacts(ShellCommand):
command += self.generateMD5cmd(artifact, QEMU_PUBLISH_DIR
+ "/qemu-tiny")
if self.layerversion_core is not None and
int(self.layerversion_core) > 2:
command=command+"cp -R --no-dereference
--preserve=links " + \
- os.path.join(self.basedir,
"tmp/deploy/images/qemux86/* ") + \
+ os.path.join(self.tmpdir,
"deploy/images/qemux86/* ") + \
" " + DEST + "/" + QEMU_PUBLISH_DIR +
"/qemu-tiny;"
else:
command=command+"cp -R --no-dereference
--preserve=links " + \
- os.path.join(self.basedir,
"tmp/deploy/images/*") + \
+ os.path.join(self.tmpdir,
"deploy/images/*") + \
DEST + "/" + QEMU_PUBLISH_DIR +
"/qemu-tiny;"
elif artifact == "conf":
artifact_name, deploy_image_dir =
self.getDeployNames(artifact, buildername)
@@ -216,12 +219,12 @@ class PublishArtifacts(ShellCommand):
if "-lsb" in buildername:
artifact_name = artifact_name + "-lsb"
if artifact_name is "md5sums":
- deploy_dir_image = os.path.join(self.basedir, "tmp/deploy/images/")
+ deploy_dir_image = os.path.join(self.tmpdir, "deploy/images/")
else:
if self.layerversion_core is not None and
int(self.layerversion_core) > 2:
- deploy_dir_image = os.path.join(os.path.join(self.basedir,
"tmp/deploy/images/"), artifact)
+ deploy_dir_image = os.path.join(os.path.join(self.tmpdir,
"deploy/images/"), artifact)
else:
- deploy_dir_image = os.path.join(self.basedir,
"tmp/deploy/images/")
+ deploy_dir_image = os.path.join(self.tmpdir, "deploy/images/")
return artifact_name, deploy_dir_image
def describe(self, done=False):
--
2.1.0
--
_______________________________________________
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
