Skip to contentSkip to conversation

Some builds (ipk, multilib) and one fix

PATCH New Stefan Stanacar 1 participant 5 messages May 8, 2013

lore
Share & tools
lore
#0 lore raw

cover Some builds (ipk, multilib) and one fix

The following changes since commit fd74be794035a2c73b206c3ca4dd4c45005037a5:

CreateAutoConf.py (2013-05-07 09:00:49 -0700)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib stefans/yab2
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=stefans/yab2

Stefan Stanacar (4):
buildsets: add some more builds
nightly-multilib: remove Publish steps
PublishLayerTarballs.py: fix command overwrite
PublishLayerTarballs.py: Cleanup spacing

 buildset-config/nightly-multilib.conf                | 13 +++++++++----
 buildset-config/nightly-qa-extras.conf               |  3 ++-
 buildset-config/nightly-x32.conf                     |  4 ++--
 .../autobuilder/buildsteps/PublishLayerTarballs.py   | 20 ++++++++++----------
 4 files changed, 23 insertions(+), 17 deletions(-)
Signature · 1 line
1.8.1.4
#2 lore raw

PATCH 2/4 nightly-multilib: remove Publish steps

Save some space by removing Publish steps, I think nobody downloads the multilib images from AB.

---
 buildset-config/nightly-multilib.conf | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
buildset-config/nightly-multilib.conf +1 -3
index 79d0011..bdb0193 100644
@@ -26,6 +26,4 @@ steps: [{'SetDest':{}},
         {'BuildImages': {'images': 'core-image-sato'}},
         {'RunSanityTests': {'images': 'core-image-sato'}},
         {'CreateAutoConf': {'machine': 'qemux86', 'SDKMACHINE' : 'i686', 'multilib': 'lib64', 'distro': 'poky'}},
-        {'BuildImages': {'images': 'lib64-core-image-sato lib64-core-image-sato-sdk lib64-core-image-lsb-sdk'}},
-        {'PublishLayerTarballs':{}},
-        {'PublishArtifacts': {'artifacts': ['qemux86-64']}}]
+        {'BuildImages': {'images': 'lib64-core-image-sato lib64-core-image-sato-sdk lib64-core-image-lsb-sdk'}}]
Signature · 1 line
1.8.1.4
#3 lore raw

PATCH 3/4 PublishLayerTarballs.py: fix command overwrite

In reply to Stefan Stanacar

command was overwritten, so the gzip archive was missing.
Also add a trailing slash to the second git archive prefix otherwise we end up with dirs like poky-revscripts instead of poky-rev/scripts.

---
 .../site-packages/autobuilder/buildsteps/PublishLayerTarballs.py      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
lib/python2.7/site-packages/autobuilder/buildsteps/PublishLayerTarballs.py +2 -2
index 2930d28..6f676be 100644
@@ -44,8 +44,8 @@ class PublishLayerTarballs(ShellCommand):
         command = " git archive --format=tar HEAD "
         command = command + "--prefix=" + self.layername + "-" + revision + "/"
         command = command  +"| gzip > " + self.layername + "-" + revision + ".tar.gz; " 
-        command = " git archive --format=tar HEAD "
-        command = command + "--prefix=" + self.layername + "-" + revision 
+        command = command + " git archive --format=tar HEAD "
+        command = command + "--prefix=" + self.layername + "-" + revision + "/"
         command = command  +"| bzip2 -c > " + self.layername + "-" + revision + ".tar.bz2; " 
         command = command  +"md5sum " + self.layername + "-" + revision + ".tar.bz2 >> "
         command = command  + self.layername + "-" + revision + ".tar.bz2.md5sum; "
Signature · 1 line
1.8.1.4
#1 lore raw

PATCH 1/4 buildsets: add some more builds

In reply to Stefan Stanacar

Let's put to good use the new packages option, by adding some ipk builds to multilib target. Also let's enable sanity tests for more images.

---
 buildset-config/nightly-multilib.conf  | 9 ++++++++-
 buildset-config/nightly-qa-extras.conf | 3 ++-
 buildset-config/nightly-x32.conf       | 4 ++--
 3 files changed, 12 insertions(+), 4 deletions(-)
buildset-config/nightly-multilib.conf +8 -1
index f9ae8b7..79d0011 100644
@@ -15,10 +15,17 @@ steps: [{'SetDest':{}},
         {'CreateAutoConf': {'machine': 'qemux86-64', 'SDKMACHINE' : 'x86_64', 'multilib': True, 'distro': 'poky'}},
         {'CreateBBLayersConf': {'buildprovider' : 'yocto'}},
         {'BuildImages': {'images': 'lib32-core-image-minimal'}},
+        {'RunSanityTests': {'images': 'lib32-core-image-minimal', 'scene' : 'sanity:boot'}},
+        {'CreateAutoConf': {'machine': 'qemux86-64', 'SDKMACHINE' : 'x86_64', 'multilib': True, 'distro': 'poky', 'packages' : 'ipk'}},
+        {'BuildImages': {'images': 'lib32-core-image-minimal'}},
+        {'RunSanityTests': {'images': 'lib32-core-image-minimal', 'scene' : 'sanity:boot'}},
         {'CreateAutoConf': {'machine': 'qemux86-64', 'SDKMACHINE' : 'x86_64', 'multilib': 'lib32', 'distro': 'poky', 'atextappend' : '\nIMAGE_INSTALL_append = " lib32-connman-gnome"\n'}},
         {'BuildImages': {'images': 'core-image-sato'}},
+        {'RunSanityTests': {'images': 'core-image-sato'}},
+        {'CreateAutoConf': {'machine': 'qemux86-64', 'SDKMACHINE' : 'x86_64', 'multilib': 'lib32', 'distro': 'poky', 'packages' : 'ipk', 'atextappend' : '\nIMAGE_INSTALL_append = " lib32-connman-gnome"\n'}},
+        {'BuildImages': {'images': 'core-image-sato'}},
+        {'RunSanityTests': {'images': 'core-image-sato'}},
         {'CreateAutoConf': {'machine': 'qemux86', 'SDKMACHINE' : 'i686', 'multilib': 'lib64', 'distro': 'poky'}},
         {'BuildImages': {'images': 'lib64-core-image-sato lib64-core-image-sato-sdk lib64-core-image-lsb-sdk'}},
         {'PublishLayerTarballs':{}},
         {'PublishArtifacts': {'artifacts': ['qemux86-64']}}]
-
buildset-config/nightly-qa-extras.conf +2 -1
index 4098f53..c3af24c 100644
@@ -13,4 +13,5 @@ steps: [{'SetDest':{}},
         {'BuildImages': {'images': 'core-image-sato'}},
         {'RunSanityTests': {'images': 'core-image-sato'}},
         {'CreateAutoConf': {'machine': 'qemux86-64', 'SDKMACHINE' : 'i686', 'distro': 'poky', 'atextappend' : '\nEXTRA_IMAGE_FEATURES = "debug-tweaks read-only-rootfs"\n'}},
-        {'BuildImages': {'images': 'core-image-sato'}}]
+        {'BuildImages': {'images': 'core-image-sato'}},
+        {'RunSanityTests': {'images': 'core-image-sato', 'scene' : 'sanity:boot sanity:ssh sanity:dmesg'}}]
buildset-config/nightly-x32.conf +2 -2
index b0b5b4f..636b1c3 100644
@@ -15,5 +15,5 @@ steps: [{'SetDest':{}},
         {'CreateAutoConf': {'machine': 'qemux86-64', 'SDKMACHINE' : 'x86_64', 'x32': True, 'distro': 'poky'}},
         {'CreateBBLayersConf': {'buildprovider' : 'yocto'}},
         {'PublishLayerTarballs':{}},
-        {'BuildImages': {'images': 'core-image-minimal core-image-sato'}}]
-
+        {'BuildImages': {'images': 'core-image-minimal core-image-sato'}},
+        {'RunSanityTests': {'images': 'core-image-minimal core-image-sato'}}]
Signature · 1 line
1.8.1.4
#4 lore raw

PATCH 4/4 PublishLayerTarballs.py: Cleanup spacing

In reply to Stefan Stanacar

No changes, just formating/spacing.

---
 .../autobuilder/buildsteps/PublishLayerTarballs.py       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
lib/python2.7/site-packages/autobuilder/buildsteps/PublishLayerTarballs.py +8 -8
index 6f676be..4a94b67 100644
@@ -43,15 +43,15 @@ class PublishLayerTarballs(ShellCommand):
                                     self.slavedir, buildername), self.workdir))
         command = " git archive --format=tar HEAD "
         command = command + "--prefix=" + self.layername + "-" + revision + "/"
-        command = command  +"| gzip > " + self.layername + "-" + revision + ".tar.gz; " 
+        command = command + " | gzip > " + self.layername + "-" + revision + ".tar.gz; "
         command = command + " git archive --format=tar HEAD "
         command = command + "--prefix=" + self.layername + "-" + revision + "/"
-        command = command  +"| bzip2 -c > " + self.layername + "-" + revision + ".tar.bz2; " 
-        command = command  +"md5sum " + self.layername + "-" + revision + ".tar.bz2 >> "
-        command = command  + self.layername + "-" + revision + ".tar.bz2.md5sum; "
-        command = command  +"md5sum " + self.layername + "-" + revision + ".tar.gz >> "
-        command = command  + self.layername + "-" + revision + ".tar.gz.md5sum; " 
-        command=command + "mkdir -p " + DEST + "; rsync -av " 
-        command=command + self.layername + "-" + revision +".tar.* " + DEST
+        command = command + " | bzip2 -c > " + self.layername + "-" + revision + ".tar.bz2; "
+        command = command + "md5sum " + self.layername + "-" + revision + ".tar.bz2 >> "
+        command = command + self.layername + "-" + revision + ".tar.bz2.md5sum; "
+        command = command + "md5sum " + self.layername + "-" + revision + ".tar.gz >> "
+        command = command + self.layername + "-" + revision + ".tar.gz.md5sum; "
+        command = command + "mkdir -p " + DEST + "; rsync -av "
+        command = command + self.layername + "-" + revision +".tar.* " + DEST
         self.command=command
         ShellCommand.start(self)
Signature · 1 line
1.8.1.4