Skip to contentSkip to conversation

buildset-config.master/*: change call to MD5 creation

PATCH In review Lynn 'Cyrin' Conway 3 participants 6 messages Jun 4, 2014 – Jun 9, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 buildset-config.master/*: change call to MD5 creation

REF: Bug ID 6354

The code for MD5 creation is being moved from MakeImageMD5s to PublishArtifacts['md5sums']. This commit changes every file in buildset-config.master that had a call to MakeImageMD5s.

---
 buildset-config.master/build-appliance.conf     |    4 ++--
 buildset-config.master/buildtools.conf          |    4 ++--
 buildset-config.master/minnow-lsb.conf          |    4 ++--
 buildset-config.master/minnow.conf              |    4 ++--
 buildset-config.master/nightly-arm-lsb.conf     |    4 ++--
 buildset-config.master/nightly-arm.conf         |    4 ++--
 buildset-config.master/nightly-fsl-arm-lsb.conf |    4 ++--
 buildset-config.master/nightly-fsl-arm.conf     |    4 ++--
 buildset-config.master/nightly-fsl-ppc-lsb.conf |    4 ++--
 buildset-config.master/nightly-fsl-ppc.conf     |    4 ++--
 buildset-config.master/nightly-mips-lsb.conf    |    4 ++--
 buildset-config.master/nightly-mips.conf        |    4 ++--
 buildset-config.master/nightly-ppc-lsb.conf     |    4 ++--
 buildset-config.master/nightly-ppc.conf         |    4 ++--
 buildset-config.master/nightly-x32.conf         |    5 +++--
 buildset-config.master/nightly-x86-64-lsb.conf  |    4 ++--
 buildset-config.master/nightly-x86-64.conf      |    4 ++--
 buildset-config.master/nightly-x86-lsb.conf     |    4 ++--
 buildset-config.master/nightly-x86.conf         |    4 ++--
 buildset-config.master/poky-tiny.conf           |    4 ++--
 20 files changed, 41 insertions(+), 40 deletions(-)
buildset-config.master/build-appliance.conf +2 -2
index d681b87..f63be2c 100644
@@ -17,6 +17,6 @@ steps: [{'SetDest':{}},
         {'CreateBBLayersConf': {'buildprovider' : 'yocto'}},
         {'BuildImages': {'images': 'universe -c fetch'}},
         {'BuildImages': {'images': 'build-appliance-image'}},
-        {'PublishLayerTarballs':{}}, {'MakeImageMD5s':{}},
-        {'PublishArtifacts': {'artifacts': ['build-appliance']}}]
+        {'PublishLayerTarballs':{}},
+        {'PublishArtifacts': {'artifacts': ['build-appliance', 'md5sums']}}]
 
buildset-config.master/buildtools.conf +2 -2
index f71e535..673b6bc 100644
@@ -11,5 +11,5 @@ steps: [{'SetDest':{}},
         {'CreateAutoConf': {'machine': 'qemux86-64', 'SDKMACHINE' : 'x86_64', 'distro': 'poky', 'buildapp': True}},
         {'CreateBBLayersConf': {'buildprovider' : 'yocto'}},
         {'BuildImages': {'images': 'buildtools-tarball'}},
-        {'PublishLayerTarballs':{}}, {'MakeImageMD5s':{}},
-        {'PublishArtifacts': {'artifacts': ['buildtools-tarball']}}]
+        {'PublishLayerTarballs':{}},
+        {'PublishArtifacts': {'artifacts': ['buildtools-tarball', 'md5sums']}}]
buildset-config.master/minnow-lsb.conf +2 -2
index d1f12aa..0293f38 100644
@@ -20,6 +20,6 @@ steps: [{'SetDest':{}},
         {'CreateAutoConf': {'machine': 'minnow', 'SDKMACHINE' : 'x86_64', 'distro': 'poky-lsb', 'emgd': 'True', 'pvr': 'False', 'atextappend': '\nNOISO="1"\nCORE_IMAGE_EXTRA_INSTALL += "dmidecode pciutils ethtool alsa-utils"\n'}},
         {'CreateBBLayersConf': {'buildprovider' : 'yocto', 'bsplayer': True, 'bspprovider': 'intel','layerdirs': ['meta-minnow', 'meta-intel', 'meta-intel/meta-tlk']}},
         {'BuildImages': {'images': 'core-image-lsb core-image-lsb-dev core-image-lsb-sdk core-image-lsb-qt3'}},
-        {'PublishLayerTarballs':{}}, {'MakeImageMD5s':{}},
-        {'PublishArtifacts': {'artifacts': ['conf', 'minnow']}}]
+        {'PublishLayerTarballs':{}},
+        {'PublishArtifacts': {'artifacts': ['conf', 'minnow', 'md5sums']}}]
 
buildset-config.master/minnow.conf +2 -2
index fcb83bd..c09a338 100644
@@ -20,6 +20,6 @@ steps: [{'SetDest':{}},
         {'CreateAutoConf': {'machine': 'minnow', 'SDKMACHINE' : 'x86_64', 'distro': 'poky', 'emgd': 'True', 'pvr': 'False', 'atextappend': '\nNOISO="1"\nCORE_IMAGE_EXTRA_INSTALL += "dmidecode pciutils ethtool alsa-utils"\n'}},
         {'CreateBBLayersConf': {'buildprovider' : 'yocto', 'bsplayer': True, 'bspprovider': 'intel','layerdirs': ['meta-minnow', 'meta-intel', 'meta-intel/meta-tlk']}},
         {'BuildImages': {'images': 'core-image-sato core-image-sato-dev core-image-sato-sdk core-image-minimal core-image-minimal-dev'}},
-        {'PublishLayerTarballs':{}}, {'MakeImageMD5s':{}},
-        {'PublishArtifacts': {'artifacts': ['minnow', 'ipk', 'rpm', 'deb']}}]
+        {'PublishLayerTarballs':{}},
+        {'PublishArtifacts': {'artifacts': ['minnow', 'ipk', 'rpm', 'deb', 'md5sums']}}]
 
buildset-config.master/nightly-arm-lsb.conf +2 -2
index 26dc4f9..86c35ad 100644
@@ -18,5 +18,5 @@ steps: [{'SetDest':{}},
         {'CreateAutoConf': {'machine': 'beagleboard', 'SDKMACHINE' : 'i686', 'distro': 'poky-lsb'}},
         {'BuildImages': {'images': 'core-image-lsb core-image-lsb-sdk'}},
         {'SyncPersistDB' : {'commit' : True, 'distro':'poky-lsb'}},
-        {'PublishLayerTarballs':{}}, {'MakeImageMD5s':{}},
-        {'PublishArtifacts': {'artifacts': ['qemuarm', 'beagleboard']}}]
+        {'PublishLayerTarballs':{}},
+        {'PublishArtifacts': {'artifacts': ['qemuarm', 'beagleboard', 'md5sums']}}]
buildset-config.master/nightly-arm.conf +2 -2
index a02b278..f7b2048 100644
@@ -23,6 +23,6 @@ steps: [{'SetDest':{}},
         {'CreateAutoConf': {'machine': 'qemuarm', 'SDKMACHINE' : 'x86_64', 'distro': 'poky', 'buildhistory' : False}},
         {'BuildToolchainImages': {}},
         {'SyncPersistDB' : {'commit' : True, 'distro':'poky'}},
-        {'PublishLayerTarballs':{}}, {'MakeImageMD5s':{}},
-        {'PublishArtifacts': {'artifacts': ['qemuarm', 'beagleboard', 'ipk', 'rpm', 'deb', 'toolchain']}}]
+        {'PublishLayerTarballs':{}},
+        {'PublishArtifacts': {'artifacts': ['qemuarm', 'beagleboard', 'ipk', 'rpm', 'deb', 'toolchain', 'md5sums']}}]
 
buildset-config.master/nightly-fsl-arm-lsb.conf +2 -2
index 48eddc0..63ade84 100644
@@ -21,6 +21,6 @@ steps: [{'SetDest':{}},
         {'BuildImages': {'images': 'core-image-lsb core-image-lsb-dev core-image-lsb-sdk core-image-lsb-qt3'}},
         {'CreateAutoConf': {'machine': 'imx28evk', 'SDKMACHINE' : 'x86_64', 'distro': 'poky-lsb', 'buildhistory' : False, 'atextprepend': 'ACCEPT_FSL_EULA = "1"\n'}},
         {'BuildImages': {'images': 'core-image-lsb core-image-lsb-dev core-image-lsb-sdk core-image-lsb-qt3'}},
-        {'PublishLayerTarballs':{}}, {'MakeImageMD5s':{}},
-        {'PublishArtifacts': {'artifacts': ['imx53qsb', 'imx6qsabresd', 'imx28evk']}}]
+        {'PublishLayerTarballs':{}},
+        {'PublishArtifacts': {'artifacts': ['imx53qsb', 'imx6qsabresd', 'imx28evk', 'md5sums']}}]
 
buildset-config.master/nightly-fsl-arm.conf +2 -2
index eacab5e..fb653aa 100644
@@ -25,7 +25,7 @@ steps: [{'SetDest':{}},
         {'BuildImages': {'images': 'core-image-sato core-image-sato-dev core-image-sato-sdk core-image-minimal core-image-minimal-dev'}},
         {'CreateAutoConf': {'machine': 'imx28evk', 'SDKMACHINE' : 'x86_64', 'distro': 'poky', 'buildhistory' : False, 'atextprepend': 'ACCEPT_FSL_EULA = "1"\n'}},
         {'BuildImages': {'images': 'core-image-sato core-image-sato-dev core-image-sato-sdk core-image-minimal core-image-minimal-dev'}},
-        {'PublishLayerTarballs':{}}, {'MakeImageMD5s':{}},
-        {'PublishArtifacts': {'artifacts': ['imx53qsb', 'imx6qsabresd', 'imx28evk', 'ipk', 'rpm', 'deb', 'toolchain']}}]
+        {'PublishLayerTarballs':{}},
+        {'PublishArtifacts': {'artifacts': ['imx53qsb', 'imx6qsabresd', 'imx28evk', 'ipk', 'rpm', 'deb', 'toolchain', 'md5sums']}}]
 
 
buildset-config.master/nightly-fsl-ppc-lsb.conf +2 -2
index 2e3abed..70ecd73 100644
@@ -17,6 +17,6 @@ steps: [{'SetDest':{}},
         {'CreateAutoConf': {'machine': 'p1022ds', 'SDKMACHINE' : 'i686', 'distro': 'poky-lsb', 'buildhistory' : False, 'atextprepend': 'ACCEPT_FSL_EULA = "1"\n'}},
         {'CreateBBLayersConf': {'buildprovider' : 'yocto', 'bsplayer' : True, 'bspprovider' : 'fsl-ppc'}},
         {'BuildImages': {'images': 'core-image-lsb core-image-lsb-dev core-image-lsb-sdk core-image-lsb-qt3'}},
-        {'PublishLayerTarballs':{}}, {'MakeImageMD5s':{}},
-        {'PublishArtifacts': {'artifacts': ['p1022ds']}}]
+        {'PublishLayerTarballs':{}},
+        {'PublishArtifacts': {'artifacts': ['p1022ds', 'md5sums']}}]
 
buildset-config.master/nightly-fsl-ppc.conf +2 -2
index 613fc8e..cbb880f 100644
@@ -21,6 +21,6 @@ steps: [{'SetDest':{}},
         {'BuildToolchainImages': {}},
         {'CreateAutoConf': {'machine': 'p1022ds', 'SDKMACHINE' : 'x86_64', 'distro': 'poky', 'buildhistory' : False, 'atextprepend': 'ACCEPT_FSL_EULA = "1"\n'}},
         {'BuildToolchainImages': {}},
-        {'PublishLayerTarballs':{}}, {'MakeImageMD5s':{}},
-        {'PublishArtifacts': {'artifacts': ['p1022ds', 'ipk', 'rpm', 'deb', 'toolchain']}}]
+        {'PublishLayerTarballs':{}},
+        {'PublishArtifacts': {'artifacts': ['p1022ds', 'ipk', 'rpm', 'deb', 'toolchain', 'md5sums']}}]
 
buildset-config.master/nightly-mips-lsb.conf +2 -2
index a8df44e..d967aa6 100644
@@ -18,5 +18,5 @@ steps: [{'SetDest':{}},
         {'CreateAutoConf': {'machine': 'routerstationpro', 'SDKMACHINE' : 'i686', 'distro': 'poky-lsb'}},
         {'BuildImages': {'images': 'core-image-lsb core-image-lsb-sdk'}},
         {'SyncPersistDB' : {'commit' : True, 'distro':'poky-lsb'}},
-        {'PublishLayerTarballs':{}}, {'MakeImageMD5s':{}},
-        {'PublishArtifacts': {'artifacts': ['qemumips', 'routerstationpro']}}]
+        {'PublishLayerTarballs':{}},
+        {'PublishArtifacts': {'artifacts': ['qemumips', 'routerstationpro', 'md5sums']}}]
buildset-config.master/nightly-mips.conf +2 -2
index b8383ef..0c5d88d 100644
@@ -23,6 +23,6 @@ steps: [{'SetDest':{}},
         {'CreateAutoConf': {'machine': 'qemumips', 'SDKMACHINE' : 'x86_64', 'distro': 'poky', 'buildhistory' : False}},
         {'BuildToolchainImages': {}},
         {'SyncPersistDB' : {'commit' : True, 'distro':'poky'}},
-        {'PublishLayerTarballs':{}}, {'MakeImageMD5s':{}},
-        {'PublishArtifacts': {'artifacts': ['qemumips', 'routerstationpro', 'ipk', 'rpm', 'deb', 'toolchain']}}]
+        {'PublishLayerTarballs':{}},
+        {'PublishArtifacts': {'artifacts': ['qemumips', 'routerstationpro', 'ipk', 'rpm', 'deb', 'toolchain', 'md5sums']}}]
 
buildset-config.master/nightly-ppc-lsb.conf +2 -2
index 09f973d..2b8798b 100644
@@ -18,6 +18,6 @@ steps: [{'SetDest':{}},
         {'CreateAutoConf': {'machine': 'mpc8315e-rdb', 'SDKMACHINE' : 'i686', 'distro': 'poky-lsb'}},
         {'BuildImages': {'images': 'core-image-lsb core-image-lsb-sdk'}},
         {'SyncPersistDB' : {'commit' : True, 'distro':'poky-lsb'}},
-        {'PublishLayerTarballs':{}}, {'MakeImageMD5s':{}},
-        {'PublishArtifacts': {'artifacts': ['qemuppc', 'mpc8315e-rdb']}}]
+        {'PublishLayerTarballs':{}},
+        {'PublishArtifacts': {'artifacts': ['qemuppc', 'mpc8315e-rdb', 'md5sums']}}]
 
buildset-config.master/nightly-ppc.conf +2 -2
index 56345ca..09fbc96 100644
@@ -23,6 +23,6 @@ steps: [{'SetDest':{}},
         {'CreateAutoConf': {'machine': 'qemuppc', 'SDKMACHINE' : 'x86_64', 'distro': 'poky', 'buildhistory' : False}},
         {'BuildToolchainImages': {}},
         {'SyncPersistDB' : {'commit' : True, 'distro':'poky'}},
-        {'PublishLayerTarballs':{}}, {'MakeImageMD5s':{}},
-        {'PublishArtifacts': {'artifacts': ['qemuppc', 'mpc8315e-rdb', 'ipk', 'rpm', 'deb', 'toolchain']}}]
+        {'PublishLayerTarballs':{}},
+        {'PublishArtifacts': {'artifacts': ['qemuppc', 'mpc8315e-rdb', 'ipk', 'rpm', 'deb', 'toolchain', 'md5sums']}}]
 
buildset-config.master/nightly-x32.conf +3 -2
index 539559a..fe55c40 100644
@@ -13,8 +13,9 @@ steps: [{'SetDest':{}},
         {'GetDistroVersion' : {'distro': 'poky'}},
         {'CreateAutoConf': {'machine': 'qemux86-64', 'SDKMACHINE' : 'x86_64', 'x32': True, 'distro': 'poky'}},
         {'CreateBBLayersConf': {'buildprovider' : 'yocto'}},
-        {'PublishLayerTarballs':{}}, {'MakeImageMD5s':{}},
+        {'PublishLayerTarballs':{}},
         {'BuildImages': {'images': 'core-image-minimal core-image-sato'}},
         {'RunSanityTests': {'images': 'core-image-minimal'}},
         {'CreateAutoConf': {'machine': 'qemux86-64', 'SDKMACHINE' : 'x86_64', 'x32': True, 'distro': 'poky'}},
-        {'RunSanityTests': {'images': 'core-image-sato', 'suitesappend' : 'x32lib'}}]
+        {'RunSanityTests': {'images': 'core-image-sato', 'suitesappend' : 'x32lib'}},
+        {'PublishArtifacts': {'artifacts': ['md5sums']}}]
buildset-config.master/nightly-x86-64-lsb.conf +2 -2
index 2eae806..643cc03 100644
@@ -18,6 +18,6 @@ steps: [{'SetDest':{}},
         {'CreateAutoConf': {'machine': 'genericx86-64', 'SDKMACHINE' : 'i686', 'distro': 'poky-lsb'}},
         {'BuildImages': {'images': 'core-image-lsb core-image-lsb-sdk'}},
         {'SyncPersistDB' : {'commit' : True, 'distro':'poky-lsb'}},
-        {'PublishLayerTarballs':{}}, {'MakeImageMD5s':{}},
-        {'PublishArtifacts': {'artifacts': ['qemux86-64', 'genericx86-64']}}]
+        {'PublishLayerTarballs':{}},
+        {'PublishArtifacts': {'artifacts': ['qemux86-64', 'genericx86-64', 'md5sums']}}]
 
buildset-config.master/nightly-x86-64.conf +2 -2
index dc17d41..7e02186 100644
@@ -23,5 +23,5 @@ steps: [{'SetDest':{}},
         {'CreateAutoConf': {'machine': 'qemux86-64', 'SDKMACHINE' : 'x86_64', 'distro': 'poky', 'buildhistory' : False}},
         {'BuildToolchainImages': {}},
         {'SyncPersistDB' : {'commit' : True, 'distro':'poky'}},
-        {'PublishLayerTarballs':{}}, {'MakeImageMD5s':{}},
-        {'PublishArtifacts': {'artifacts': ['qemux86-64', 'genericx86-64', 'ipk', 'rpm', 'deb', 'toolchain']}}]
+        {'PublishLayerTarballs':{}},
+        {'PublishArtifacts': {'artifacts': ['qemux86-64', 'genericx86-64', 'ipk', 'rpm', 'deb', 'toolchain', 'md5sums']}}]
buildset-config.master/nightly-x86-lsb.conf +2 -2
index df4bb35..29aef69 100644
@@ -18,6 +18,6 @@ steps: [{'SetDest':{}},
         {'CreateAutoConf': {'machine': 'genericx86', 'SDKMACHINE' : 'i686', 'distro': 'poky-lsb'}},
         {'BuildImages': {'images': 'core-image-lsb core-image-lsb-sdk'}},
         {'SyncPersistDB' : {'commit' : True, 'distro':'poky-lsb'}},
-        {'PublishLayerTarballs':{}}, {'MakeImageMD5s':{}},
-        {'PublishArtifacts': {'artifacts': ['qemux86', 'genericx86']}}]
+        {'PublishLayerTarballs':{}},
+        {'PublishArtifacts': {'artifacts': ['qemux86', 'genericx86', 'md5sums']}}]
 
buildset-config.master/nightly-x86.conf +2 -2
index b808b06..4c057e4 100644
@@ -23,5 +23,5 @@ steps: [{'SetDest':{}},
         {'CreateAutoConf': {'machine': 'qemux86', 'SDKMACHINE' : 'x86_64', 'distro': 'poky', 'buildhistory' : False}},
         {'BuildToolchainImages': {}},
         {'SyncPersistDB' : {'commit' : True, 'distro':'poky'}},
-        {'PublishLayerTarballs':{}}, {'MakeImageMD5s':{}},
-        {'PublishArtifacts': {'artifacts': ['qemux86', 'genericx86', 'ipk', 'rpm', 'deb', 'toolchain']}}]
+        {'PublishLayerTarballs':{}},
+        {'PublishArtifacts': {'artifacts': ['qemux86', 'genericx86', 'ipk', 'rpm', 'deb', 'toolchain', 'md5sums']}}]
buildset-config.master/poky-tiny.conf +2 -2
index ea6b7ed..033863e 100644
@@ -14,6 +14,6 @@ steps: [{'SetDest':{}},
         {'CreateAutoConf': {'machine': 'qemux86', 'SDKMACHINE' : 'i686', 'distro': 'poky-tiny'}},
         {'CreateBBLayersConf': {'buildprovider' : 'yocto'}},
         {'BuildImages': {'images': 'core-image-minimal'}},
-        {'PublishLayerTarballs':{}}, {'MakeImageMD5s':{}},
-        {'PublishArtifacts': {'artifacts': ['tiny']}}]
+        {'PublishLayerTarballs':{}},
+        {'PublishArtifacts': {'artifacts': ['tiny', 'md5sums']}}]
 
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 2/3 MakeImageMD5s: delete file

REF: Bug ID 6354

The functionality of MakeImageMDs is being moved into PublishArtifacts. Since MakeImageMD5s is no longer needed, this commit deletes it.

---
 .../autobuilder/buildsteps/MakeImageMD5s.py        |   42 --------------------
 1 file changed, 42 deletions(-)
 delete mode 100644 lib/python2.7/site-packages/autobuilder/buildsteps/MakeImageMD5s.py
lib/python2.7/site-packages/autobuilder/buildsteps/MakeImageMD5s.py deleted +0 -42
deleted file mode 100644
index 84839fb..0000000
@@ -1,42 +0,0 @@
-'''
-Created on May 5, 2014
-
-__author__ = "Elizabeth 'pidge' Flanagan"
-__copyright__ = "Copyright 2012-2014, Intel Corp."
-__credits__ = ["Elizabeth Flanagan"]
-__license__ = "GPL"
-__version__ = "2.0"
-__maintainer__ = "Elizabeth Flanagan"
-__email__ = "[email protected]"
-'''
-
-from buildbot.steps.shell import ShellCommand
-from twisted.python import log
-import os, datetime
-from autobuilder.config import *
-
-class MakeImageMD5s(ShellCommand):
-    haltOnFailure = False
-    flunkOnFailure = True
-    name = "Make Image MD5s"
-    def __init__(self, factory, argdict=None, **kwargs):
-        self.factory = factory
-        self.description = "Making image md5sum file"
-        self.slavedir=os.path.join(os.path.join(YOCTO_ABBASE, "yocto-slave"))
-        for k, v in argdict.iteritems():
-            setattr(self, k, v)
-        self.timeout = 100000
-        kwargs['timeout']=self.timeout
-        ShellCommand.__init__(self, **kwargs)
-
-    def start(self):
-        DEST=self.getProperty("DEST")
-        buildername=self.getProperty("buildername")
-        command=""
-        if str(os.environ.get('PUBLISH_BUILDS')) == "True":
-            command = command + "for x in `find build/tmp/deploy/images -type f`; do "
-            command = command + "filenm=`basename $x`; md5sum $x >> $filenm.md5sum; done"
-        else:
-            command="echo 'Not publishing build, skipping step'"
-        self.command = command
-        ShellCommand.start(self)
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH 3/3 PublishArtifacts: add md5sums artifact

REF: Bug ID 6354

Added a md5sums artifact into PublishArtifacts

---
 .../autobuilder/buildsteps/PublishArtifacts.py     |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py +5 -1
index db86ec2..bb69d18 100644
@@ -180,6 +180,10 @@ class PublishArtifacts(ShellCommand):
                     command=command+"cp -R --no-dereference " + \
                                      os.path.join(self.basedir, "conf/") + \
                                      "/* " + DEST + "/" + MACHINE_PUBLISH_DIR + "/" + artifact_name + "/conf;"
+                elif artifact == "md5sums":
+                    artifact_name, deploy_image_dir = self.getDeployNames(artifact, buildername)
+                    command = command + "for x in `find " + deploy_image_dir + " -type f`; do "
+                    command = command + "filenm=`basename $x`; md5sum $x >> $filenm.md5sum; done"
                 elif artifact == "None":
                     command=command+"echo 'Skipping copy of " + artifact + ".'"
                 else:
@@ -216,7 +220,7 @@ class PublishArtifacts(ShellCommand):
             artifact_name = artifact_name + "-lsb"
         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)
-        else:
+        else:1
             deploy_dir_image = os.path.join(self.basedir, "tmp/deploy/images/")
         return artifact_name, deploy_dir_image
 
Signature · 1 line
1.7.9.5
#3 lore raw

Re: [PATCH 3/3] PublishArtifacts: add md5sums artifact

lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py class PublishArtifacts(ShellCommand): · line 223

Quoted 2 lines · Lynn 'Cyrin' Conway
lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py +1 -1
-        else:
+        else:1

Pretty sure you didn't mean that :)

Ross

#4 lore raw

Re: [PATCH 3/3] PublishArtifacts: add md5sums artifact

In reply to Lynn 'Cyrin' Conway

I just grabbed the current master.

I changed my local conf definition so it would do the MakeImageMD5s. It creates them inside of the build directory by default.

After doing this, the PublishArtifacts was still failing because the cp command could not find the md5sum files. It looks in the tmp/deploy/images directory.

I applied this patch so that the MakeImageMD5s step would generate them in the temp/deploy/images directory and allow the PublishArtifact build step to work.

lib/python2.7/site-packages/autobuilder/buildsteps/MakeImageMD5s.py +1 -1
index 84839fb..7bfb2b3 100644
@@ -35,7 +35,7 @@ class MakeImageMD5s(ShellCommand):
         command=""
         if str(os.environ.get('PUBLISH_BUILDS')) == "True":
             command = command + "for x in `find build/tmp/deploy/images -type f
-            command = command + "filenm=`basename $x`; md5sum $x >> $filenm.md5
+            command = command + "md5sum $x >> $x.md5sum; done"
         else:
             command="echo 'Not publishing build, skipping step'"
         self.command = command

After seeing this patch, I wonder if this should be applied to PublishArtifacts now.

- Jate S.

Quoted 41 lines · Lynn 'Cyrin' Conway

REF: Bug ID 6354

Added a md5sums artifact into PublishArtifacts

---
 .../autobuilder/buildsteps/PublishArtifacts.py     |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py +5 -2
index db86ec2..bb69d18 100644
@@ -180,6 +180,10 @@ class PublishArtifacts(ShellCommand):
                     command=command+"cp -R --no-dereference " + \
                                      os.path.join(self.basedir, "conf/") + \
                                      "/* " + DEST + "/" + MACHINE_PUBLISH_DIR + "/" + artifact_name + "/conf;"
+                elif artifact == "md5sums":
+                    artifact_name, deploy_image_dir = self.getDeployNames(artifact, buildername)
+                    command = command + "for x in `find " + deploy_image_dir + " -type f`; do "
+                    command = command + "filenm=`basename $x`; md5sum $x >> $filenm.md5sum; done"
                 elif artifact == "None":
                     command=command+"echo 'Skipping copy of " + artifact + ".'"
                 else:
@@ -216,7 +220,7 @@ class PublishArtifacts(ShellCommand):
             artifact_name = artifact_name + "-lsb"
         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)
-        else:
+        else:1
             deploy_dir_image = os.path.join(self.basedir, "tmp/deploy/images/")
         return artifact_name, deploy_dir_image
 
--

1.7.9.5

--
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto

author
#5 lore raw

Re: [PATCH 3/3] PublishArtifacts: add md5sums artifact

It would. I'll incorporate it when I resend the patch.

Lynn Cyrin (http://lynncyrin.me) -Sent from Mobile

Quoted 92 lines · Jate S

I just grabbed the current master.

I changed my local conf definition so it would do the MakeImageMD5s. It creates them inside of the build directory by default.

After doing this, the PublishArtifacts was still failing because the cp command could not find the md5sum files. It looks in the tmp/deploy/images directory.

I applied this patch so that the MakeImageMD5s step would generate them in the temp/deploy/images directory and allow the PublishArtifact build step to work.

diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/MakeImageMD5s.py index 84839fb..7bfb2b3 100644

lib/python2.7/site-packages/autobuilder/buildsteps/MakeImageMD5s.py +0 -2
@@ -35,7 +35,7 @@ class MakeImageMD5s(ShellCommand):
         command=""
         if str(os.environ.get('PUBLISH_BUILDS')) == "True":
             command = command + "for x in `find build/tmp/deploy/images
-type f
-            command = command + "filenm=`basename $x`; md5sum $x >>

$filenm.md5
+ command = command + "md5sum $x >> $x.md5sum; done"
else:
command="echo 'Not publishing build, skipping step'"
self.command = command

After seeing this patch, I wonder if this should be applied to PublishArtifacts now.

- Jate S.

Quoted 10 lines · Lynn 'Cyrin' Conway

REF: Bug ID 6354

Added a md5sums artifact into PublishArtifacts

---
 .../autobuilder/buildsteps/PublishArtifacts.py     |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git

a/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py b/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py

Quoted 2 lines

index db86ec2..bb69d18 100644
---

a/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py

Quoted 1 line

+++

b/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py

Review class PublishArtifacts(ShellCommand): · line 181

Quoted 3 lines
(quoted diff) +0 -0
@@ -180,6 +180,10 @@ class PublishArtifacts(ShellCommand):
                     command=command+"cp -R --no-dereference " + \
                                      os.path.join(self.basedir,

"conf/") + \

Review class PublishArtifacts(ShellCommand): · line 182

Quoted 1 line
(quoted diff) +0 -0
                                      "/* " + DEST + "/" +

MACHINE_PUBLISH_DIR + "/" + artifact_name + "/conf;"

Review class PublishArtifacts(ShellCommand): · line 184

Quoted 2 lines
(quoted diff) +2 -0
+                elif artifact == "md5sums":
+                    artifact_name, deploy_image_dir =

self.getDeployNames(artifact, buildername)

Review class PublishArtifacts(ShellCommand): · line 185

Quoted 1 line
(quoted diff) +1 -0
+                    command = command + "for x in `find " +

deploy_image_dir + " -type f`; do "

Review class PublishArtifacts(ShellCommand): · line 186

Quoted 1 line
(quoted diff) +1 -0
+                    command = command + "filenm=`basename $x`; md5sum

$x >> $filenm.md5sum; done"

Review class PublishArtifacts(ShellCommand): · line 188

Quoted 2 lines
(quoted diff) +0 -0
                 elif artifact == "None":
                     command=command+"echo 'Skipping copy of " +

artifact + ".'"

Review class PublishArtifacts(ShellCommand): · line 221

Quoted 4 lines
(quoted diff) +0 -0
                 else:
@@ -216,7 +220,7 @@ class PublishArtifacts(ShellCommand):
             artifact_name = artifact_name + "-lsb"
         if self.layerversion_core is not None and

int(self.layerversion_core) > 2:

Review class PublishArtifacts(ShellCommand): · line 222

Quoted 1 line
(quoted diff) +0 -0
             deploy_dir_image = os.path.join(os.path.join(self.basedir,

"tmp/deploy/images/"), artifact)

Review class PublishArtifacts(ShellCommand): · line 224

Quoted 3 lines
(quoted diff) +1 -1
-        else:
+        else:1
             deploy_dir_image = os.path.join(self.basedir,

"tmp/deploy/images/")

Quoted 10 lines
(quoted diff) +0 -1
         return artifact_name, deploy_dir_image
 
--

1.7.9.5

--
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto