All of lore.kernel.org
 help / color / mirror / Atom feed
* [yocto-autobuilder][PATCH 0/2] publish wic images
@ 2016-07-06 20:16 Bill Randle
  2016-07-06 20:16 ` [yocto-autobuilder][PATCH 1/2] PublishArtifacts.py: create md5sum files in same dir as artifacts Bill Randle
                   ` (3 more replies)
  0 siblings, 4 replies; 7+ messages in thread
From: Bill Randle @ 2016-07-06 20:16 UTC (permalink / raw)
  To: yocto

QA started testing wic images in Yocto 2.1, but was building them
themselves. Have the autobuilder publish the wic images so they are
available for testing.

[YOCTO #9397]

Bill Randle (2):
  PublishArtifacts.py: create md5sum files in same dir as artifacts
  publish build artifacts for wic images

 buildset-config.controller/nightly-wic.conf        |  8 ++---
 .../autobuilder/buildsteps/PublishArtifacts.py     | 40 +++++++++++++++-------
 2 files changed, 30 insertions(+), 18 deletions(-)

-- 
2.5.5



^ permalink raw reply	[flat|nested] 7+ messages in thread

* [yocto-autobuilder][PATCH 1/2] PublishArtifacts.py: create md5sum files in same dir as artifacts
  2016-07-06 20:16 [yocto-autobuilder][PATCH 0/2] publish wic images Bill Randle
@ 2016-07-06 20:16 ` Bill Randle
  2016-07-06 20:16 ` [yocto-autobuilder][PATCH 2/2] publish build artifacts for wic images Bill Randle
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 7+ messages in thread
From: Bill Randle @ 2016-07-06 20:16 UTC (permalink / raw)
  To: yocto

Previously all the md5sum files got put into the top level deploy directory.
This patch keeps the md5sum file in the same directory as the file it is
hashing. It also limits the traversal depth to five, to avoid hashing the
wic components that go into making the wic images.

Signed-off-by: Bill Randle <william.c.randle@intel.com>
---
 .../site-packages/autobuilder/buildsteps/PublishArtifacts.py         | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py b/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py
index 111dad7..952a458 100644
--- a/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py
+++ b/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py
@@ -233,9 +233,8 @@ class PublishArtifacts(ShellCommand):
     def generateMD5cmd(self, artifact, deploy_dir):
         cmd = ""
         if os.environ.get('GEN_IMG_MD5') == "True":
-            cmd += "for x in `find " + deploy_dir + " -type f`;"
-            cmd += "do fname=`basename $x`;"
-            cmd += "md5sum $x >> " + deploy_dir + "/$fname.md5sum; done;"
+            cmd += "for x in `find " + deploy_dir + " -type f -maxdepth 5`;"
+            cmd += "do md5sum $x >> " + "$x.md5sum; done;"
         return cmd
 
     def getDeployNames(self, artifact, buildername):
-- 
2.5.5



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [yocto-autobuilder][PATCH 2/2] publish build artifacts for wic images
  2016-07-06 20:16 [yocto-autobuilder][PATCH 0/2] publish wic images Bill Randle
  2016-07-06 20:16 ` [yocto-autobuilder][PATCH 1/2] PublishArtifacts.py: create md5sum files in same dir as artifacts Bill Randle
@ 2016-07-06 20:16 ` Bill Randle
  2016-07-14  9:38   ` Joshua G Lock
  2016-07-13 21:10 ` [yocto-autobuilder][PATCH 0/2] publish " Randle, William C
  2016-07-14 15:53 ` Joshua G Lock
  3 siblings, 1 reply; 7+ messages in thread
From: Bill Randle @ 2016-07-06 20:16 UTC (permalink / raw)
  To: yocto

Publish the wic images created by the nightly-wic build so they are
available for QA testing.

[YOCTO #9397]

Signed-off-by: Bill Randle <william.c.randle@intel.com>
---
 buildset-config.controller/nightly-wic.conf        |  8 ++---
 .../autobuilder/buildsteps/PublishArtifacts.py     | 35 ++++++++++++++++------
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/buildset-config.controller/nightly-wic.conf b/buildset-config.controller/nightly-wic.conf
index 7d2ae88..27584cb 100644
--- a/buildset-config.controller/nightly-wic.conf
+++ b/buildset-config.controller/nightly-wic.conf
@@ -19,10 +19,6 @@ steps: [{'SetDest':{}},
         {'BuildImages':{'images':'core-image-sato'}},
         {'CreateWicImages':{'wic_img_type':'directdisk', 'target_img':'core-image-sato'}},
         {'CreateWicImages':{'wic_img_type':'directdisk-gpt', 'target_img':'core-image-sato'}},
-        {'CreateWicImages':{'wic_img_type':'mkefidisk', 'target_img':'core-image-sato'}}]
-
-
-
-
-
+        {'CreateWicImages':{'wic_img_type':'mkefidisk', 'target_img':'core-image-sato'}},
+        {'PublishArtifacts': {'artifacts': ['qemux86-64', 'genericx86-64']}}]
 
diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py b/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py
index 952a458..f9df16c 100644
--- a/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py
+++ b/lib/python2.7/site-packages/autobuilder/buildsteps/PublishArtifacts.py
@@ -174,7 +174,14 @@ class PublishArtifacts(ShellCommand):
                     artifact_name, deploy_image_dir = self.getDeployNames(artifact, buildername)
                     command += self.generateMD5cmd(artifact, deploy_image_dir)
                     command=command+"mkdir -p " + DEST + "/" + QEMU_PUBLISH_DIR + "/" + artifact_name + ";"
-                    command=command+"cp -R --no-dereference --preserve=links " + \
+                    if "-wic" in buildername:
+                        deploy_image_dir += "/*/*/build";
+                        command=command+"cp --no-dereference --preserve=links " + \
+                                    deploy_image_dir + "/*\.direct " + \
+                                    deploy_image_dir + "/*\.direct.md5sum " + \
+                                    DEST + "/" + QEMU_PUBLISH_DIR + "/" + artifact_name + ";"
+                    else:
+                        command=command+"cp -R --no-dereference --preserve=links " + \
                                     deploy_image_dir + \
                                     "/*" + artifact + "* " + DEST + "/" + QEMU_PUBLISH_DIR + "/" + artifact_name + ";"
                 elif "mpc8315e" in artifact:
@@ -213,18 +220,26 @@ class PublishArtifacts(ShellCommand):
                        "genericx86-64" in artifact:
                         command = command+"echo 'Skipping copy of genericx86-64.'; "
                     else:
-                        command=command+"mkdir -p " + DEST + "/"+ MACHINE_PUBLISH_DIR +"/" + artifact_name + ";"
-                        if "beagle" in artifact:
-                            command=command+"cp -R --no-dereference --preserve=links " + \
+                        command += self.generateMD5cmd(artifact, deploy_image_dir)
+                        if "-wic" in buildername:
+                            deploy_image_dir += "/*/*/build";
+                            command=command+"mkdir -p " + DEST + "/" + MACHINE_PUBLISH_DIR + "/" + artifact_name + ";"
+                            command=command+"cp --no-dereference --preserve=links " + \
+                                    deploy_image_dir + "/*\.direct " + \
+                                    deploy_image_dir + "/*\.direct.md5sum " + \
+                                    DEST + "/" + MACHINE_PUBLISH_DIR + "/" + artifact_name + ";"
+                        else:
+                            command=command+"mkdir -p " + DEST + "/"+ MACHINE_PUBLISH_DIR +"/" + artifact_name + ";"
+                            if "beagle" in artifact:
+                                command=command+"cp -R --no-dereference --preserve=links " + \
                                              deploy_image_dir + \
                                              "/*Image* " + DEST + "/" + MACHINE_PUBLISH_DIR +"/" + artifact_name + ";"
-                            command=command+"cp -R --no-dereference --preserve=links " + \
+                                command=command+"cp -R --no-dereference --preserve=links " + \
                                              deploy_image_dir + \
                                              "/u-boot* " + DEST + "/" + MACHINE_PUBLISH_DIR +"/" + artifact_name + ";"
-                        command=command+"cp -R --no-dereference --preserve=links " + \
+                            command=command+"cp -R --no-dereference --preserve=links " + \
                                          deploy_image_dir + \
                                          "/*"+artifact+"* " + DEST + "/" + MACHINE_PUBLISH_DIR +"/" + artifact_name + ";"
-                    command += self.generateMD5cmd(artifact, deploy_image_dir)
             self.command = command
         else:
             self.command = "echo 'Skipping Step.'"
@@ -241,8 +256,10 @@ class PublishArtifacts(ShellCommand):
         artifact_name = artifact
         if "-lsb" in buildername:
             artifact_name = artifact_name + "-lsb"
-        if artifact_name is "md5sums":
-            deploy_dir_image = os.path.join(self.tmpdir, "deploy/images/")
+        if "-wic" in buildername:
+            deploy_dir_image = os.path.join(os.path.join(self.tmpdir, "deploy/wic_images/"), artifact)
+        elif artifact_name is "md5sums":
+            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.tmpdir, "deploy/images/"), artifact)
-- 
2.5.5



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [yocto-autobuilder][PATCH 0/2] publish wic images
  2016-07-06 20:16 [yocto-autobuilder][PATCH 0/2] publish wic images Bill Randle
  2016-07-06 20:16 ` [yocto-autobuilder][PATCH 1/2] PublishArtifacts.py: create md5sum files in same dir as artifacts Bill Randle
  2016-07-06 20:16 ` [yocto-autobuilder][PATCH 2/2] publish build artifacts for wic images Bill Randle
@ 2016-07-13 21:10 ` Randle, William C
  2016-07-14 15:53 ` Joshua G Lock
  3 siblings, 0 replies; 7+ messages in thread
From: Randle, William C @ 2016-07-13 21:10 UTC (permalink / raw)
  To: yocto

[-- Attachment #1: Type: text/plain, Size: 580 bytes --]

ping...

On Wed, 2016-07-06 at 13:16 -0700, Bill Randle wrote:

QA started testing wic images in Yocto 2.1, but was building them
themselves. Have the autobuilder publish the wic images so they are
available for testing.

[YOCTO #9397]

Bill Randle (2):
  PublishArtifacts.py: create md5sum files in same dir as artifacts
  publish build artifacts for wic images

 buildset-config.controller/nightly-wic.conf        |  8 ++---
 .../autobuilder/buildsteps/PublishArtifacts.py     | 40 +++++++++++++++-------
 2 files changed, 30 insertions(+), 18 deletions(-)



[-- Attachment #2: Type: text/html, Size: 925 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [yocto-autobuilder][PATCH 2/2] publish build artifacts for wic images
  2016-07-06 20:16 ` [yocto-autobuilder][PATCH 2/2] publish build artifacts for wic images Bill Randle
@ 2016-07-14  9:38   ` Joshua G Lock
  2016-07-14 14:49     ` Randle, William C
  0 siblings, 1 reply; 7+ messages in thread
From: Joshua G Lock @ 2016-07-14  9:38 UTC (permalink / raw)
  To: Bill Randle, yocto

On Wed, 2016-07-06 at 13:16 -0700, Bill Randle wrote:
> Publish the wic images created by the nightly-wic build so they are
> available for QA testing.
> 
> [YOCTO #9397]
> 
> Signed-off-by: Bill Randle <william.c.randle@intel.com>
> ---
>  buildset-config.controller/nightly-wic.conf        |  8 ++---
>  .../autobuilder/buildsteps/PublishArtifacts.py     | 35
> ++++++++++++++++------
>  2 files changed, 28 insertions(+), 15 deletions(-)
> 
> diff --git a/buildset-config.controller/nightly-wic.conf b/buildset-
> config.controller/nightly-wic.conf
> index 7d2ae88..27584cb 100644
> --- a/buildset-config.controller/nightly-wic.conf
> +++ b/buildset-config.controller/nightly-wic.conf
> @@ -19,10 +19,6 @@ steps: [{'SetDest':{}},
>          {'BuildImages':{'images':'core-image-sato'}},
>          {'CreateWicImages':{'wic_img_type':'directdisk',
> 'target_img':'core-image-sato'}},
>          {'CreateWicImages':{'wic_img_type':'directdisk-gpt',
> 'target_img':'core-image-sato'}},
> -        {'CreateWicImages':{'wic_img_type':'mkefidisk',
> 'target_img':'core-image-sato'}}]
> -
> -
> -
> -
> -
> +        {'CreateWicImages':{'wic_img_type':'mkefidisk',
> 'target_img':'core-image-sato'}},
> +        {'PublishArtifacts': {'artifacts': ['qemux86-64',
> 'genericx86-64']}}]
>  
> diff --git a/lib/python2.7/site-
> packages/autobuilder/buildsteps/PublishArtifacts.py
> b/lib/python2.7/site-
> packages/autobuilder/buildsteps/PublishArtifacts.py
> index 952a458..f9df16c 100644
> --- a/lib/python2.7/site-
> packages/autobuilder/buildsteps/PublishArtifacts.py
> +++ b/lib/python2.7/site-
> packages/autobuilder/buildsteps/PublishArtifacts.py
> @@ -174,7 +174,14 @@ class PublishArtifacts(ShellCommand):
>                      artifact_name, deploy_image_dir =
> self.getDeployNames(artifact, buildername)
>                      command += self.generateMD5cmd(artifact,
> deploy_image_dir)
>                      command=command+"mkdir -p " + DEST + "/" +
> QEMU_PUBLISH_DIR + "/" + artifact_name + ";"
> -                    command=command+"cp -R --no-dereference --
> preserve=links " + \
> +                    if "-wic" in buildername:
> +                        deploy_image_dir += "/*/*/build";
> +                        command=command+"cp --no-dereference --
> preserve=links " + \
> +                                    deploy_image_dir + "/*\.direct "
> + \
> +                                    deploy_image_dir +
> "/*\.direct.md5sum " + \
> +                                    DEST + "/" + QEMU_PUBLISH_DIR +
> "/" + artifact_name + ";"
> +                    else:
> +                        command=command+"cp -R --no-dereference --
> preserve=links " + \
>                                      deploy_image_dir + \
>                                      "/*" + artifact + "* " + DEST +
> "/" + QEMU_PUBLISH_DIR + "/" + artifact_name + ";"
>                  elif "mpc8315e" in artifact:
> @@ -213,18 +220,26 @@ class PublishArtifacts(ShellCommand):
>                         "genericx86-64" in artifact:
>                          command = command+"echo 'Skipping copy of
> genericx86-64.'; "
>                      else:
> -                        command=command+"mkdir -p " + DEST + "/"+
> MACHINE_PUBLISH_DIR +"/" + artifact_name + ";"
> -                        if "beagle" in artifact:
> -                            command=command+"cp -R --no-dereference
> --preserve=links " + \
> +                        command += self.generateMD5cmd(artifact,
> deploy_image_dir)

If I'm reading this patch correctly this change moves the addition of
generateMD5cmd() to the command string into the else block of the
"layerversion_yoctobsp < 2" check, whereas before it was appended
regardless after the if/else statement. Was that change intentional?

Regards,

Joshua

> +                        if "-wic" in buildername:
> +                            deploy_image_dir += "/*/*/build";
> +                            command=command+"mkdir -p " + DEST + "/"
> + MACHINE_PUBLISH_DIR + "/" + artifact_name + ";"
> +                            command=command+"cp --no-dereference --
> preserve=links " + \
> +                                    deploy_image_dir + "/*\.direct "
> + \
> +                                    deploy_image_dir +
> "/*\.direct.md5sum " + \
> +                                    DEST + "/" + MACHINE_PUBLISH_DIR
> + "/" + artifact_name + ";"
> +                        else:
> +                            command=command+"mkdir -p " + DEST +
> "/"+ MACHINE_PUBLISH_DIR +"/" + artifact_name + ";"
> +                            if "beagle" in artifact:
> +                                command=command+"cp -R --no-
> dereference --preserve=links " + \
>                                               deploy_image_dir + \
>                                               "/*Image* " + DEST +
> "/" + MACHINE_PUBLISH_DIR +"/" + artifact_name + ";"
> -                            command=command+"cp -R --no-dereference
> --preserve=links " + \
> +                                command=command+"cp -R --no-
> dereference --preserve=links " + \
>                                               deploy_image_dir + \
>                                               "/u-boot* " + DEST +
> "/" + MACHINE_PUBLISH_DIR +"/" + artifact_name + ";"
> -                        command=command+"cp -R --no-dereference --
> preserve=links " + \
> +                            command=command+"cp -R --no-dereference
> --preserve=links " + \
>                                           deploy_image_dir + \
>                                           "/*"+artifact+"* " + DEST +
> "/" + MACHINE_PUBLISH_DIR +"/" + artifact_name + ";"
> -                    command += self.generateMD5cmd(artifact,
> deploy_image_dir)
>              self.command = command
>          else:
>              self.command = "echo 'Skipping Step.'"
> @@ -241,8 +256,10 @@ class PublishArtifacts(ShellCommand):
>          artifact_name = artifact
>          if "-lsb" in buildername:
>              artifact_name = artifact_name + "-lsb"
> -        if artifact_name is "md5sums":
> -            deploy_dir_image = os.path.join(self.tmpdir,
> "deploy/images/")
> +        if "-wic" in buildername:
> +            deploy_dir_image =
> os.path.join(os.path.join(self.tmpdir, "deploy/wic_images/"),
> artifact)
> +        elif artifact_name is "md5sums":
> +            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.tmpdir, "deploy/images/"), artifact)


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [yocto-autobuilder][PATCH 2/2] publish build artifacts for wic images
  2016-07-14  9:38   ` Joshua G Lock
@ 2016-07-14 14:49     ` Randle, William C
  0 siblings, 0 replies; 7+ messages in thread
From: Randle, William C @ 2016-07-14 14:49 UTC (permalink / raw)
  To: joshua.g.lock, yocto

[-- Attachment #1: Type: text/plain, Size: 6963 bytes --]

On Thu, 2016-07-14 at 10:38 +0100, Joshua G Lock wrote:

On Wed, 2016-07-06 at 13:16 -0700, Bill Randle wrote:


Publish the wic images created by the nightly-wic build so they are
available for QA testing.

[YOCTO #9397]

Signed-off-by: Bill Randle <william.c.randle@intel.com<mailto:william.c.randle@intel.com>>
---
 buildset-config.controller/nightly-wic.conf        |  8 ++---
 .../autobuilder/buildsteps/PublishArtifacts.py     | 35
++++++++++++++++------
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/buildset-config.controller/nightly-wic.conf b/buildset-
config.controller/nightly-wic.conf
index 7d2ae88..27584cb 100644
--- a/buildset-config.controller/nightly-wic.conf
+++ b/buildset-config.controller/nightly-wic.conf
@@ -19,10 +19,6 @@ steps: [{'SetDest':{}},
         {'BuildImages':{'images':'core-image-sato'}},
         {'CreateWicImages':{'wic_img_type':'directdisk',
'target_img':'core-image-sato'}},
         {'CreateWicImages':{'wic_img_type':'directdisk-gpt',
'target_img':'core-image-sato'}},
-        {'CreateWicImages':{'wic_img_type':'mkefidisk',
'target_img':'core-image-sato'}}]
-
-
-
-
-
+        {'CreateWicImages':{'wic_img_type':'mkefidisk',
'target_img':'core-image-sato'}},
+        {'PublishArtifacts': {'artifacts': ['qemux86-64',
'genericx86-64']}}]

diff --git a/lib/python2.7/site-
packages/autobuilder/buildsteps/PublishArtifacts.py
b/lib/python2.7/site-
packages/autobuilder/buildsteps/PublishArtifacts.py
index 952a458..f9df16c 100644
--- a/lib/python2.7/site-
packages/autobuilder/buildsteps/PublishArtifacts.py
+++ b/lib/python2.7/site-
packages/autobuilder/buildsteps/PublishArtifacts.py
@@ -174,7 +174,14 @@ class PublishArtifacts(ShellCommand):
                     artifact_name, deploy_image_dir =
self.getDeployNames(artifact, buildername)
                     command += self.generateMD5cmd(artifact,
deploy_image_dir)
                     command=command+"mkdir -p " + DEST + "/" +
QEMU_PUBLISH_DIR + "/" + artifact_name + ";"
-                    command=command+"cp -R --no-dereference --
preserve=links " + \
+                    if "-wic" in buildername:
+                        deploy_image_dir += "/*/*/build";
+                        command=command+"cp --no-dereference --
preserve=links " + \
+                                    deploy_image_dir + "/*\.direct "
+ \
+                                    deploy_image_dir +
"/*\.direct.md5sum " + \
+                                    DEST + "/" + QEMU_PUBLISH_DIR +
"/" + artifact_name + ";"
+                    else:
+                        command=command+"cp -R --no-dereference --
preserve=links " + \
                                     deploy_image_dir + \
                                     "/*" + artifact + "* " + DEST +
"/" + QEMU_PUBLISH_DIR + "/" + artifact_name + ";"
                 elif "mpc8315e" in artifact:
@@ -213,18 +220,26 @@ class PublishArtifacts(ShellCommand):
                        "genericx86-64" in artifact:
                         command = command+"echo 'Skipping copy of
genericx86-64.'; "
                     else:
-                        command=command+"mkdir -p " + DEST + "/"+
MACHINE_PUBLISH_DIR +"/" + artifact_name + ";"
-                        if "beagle" in artifact:
-                            command=command+"cp -R --no-dereference
--preserve=links " + \
+                        command += self.generateMD5cmd(artifact,
deploy_image_dir)



If I'm reading this patch correctly this change moves the addition of
generateMD5cmd() to the command string into the else block of the
"layerversion_yoctobsp < 2" check, whereas before it was appended
regardless after the if/else statement. Was that change intentional?

Regards,

Joshua



Yes, it was intentional. If the layerversion is < 2 and you're expecting genericx86_64, that's not a supported configuration, so there is no image to run a md5sum on. We also want to run the md5sum calculation before we copy artifacts, rather than after, so that the md5sum files are included in the copy.

    -Bill



+                        if "-wic" in buildername:
+                            deploy_image_dir += "/*/*/build";
+                            command=command+"mkdir -p " + DEST + "/"
+ MACHINE_PUBLISH_DIR + "/" + artifact_name + ";"
+                            command=command+"cp --no-dereference --
preserve=links " + \
+                                    deploy_image_dir + "/*\.direct "
+ \
+                                    deploy_image_dir +
"/*\.direct.md5sum " + \
+                                    DEST + "/" + MACHINE_PUBLISH_DIR
+ "/" + artifact_name + ";"
+                        else:
+                            command=command+"mkdir -p " + DEST +
"/"+ MACHINE_PUBLISH_DIR +"/" + artifact_name + ";"
+                            if "beagle" in artifact:
+                                command=command+"cp -R --no-
dereference --preserve=links " + \
                                              deploy_image_dir + \
                                              "/*Image* " + DEST +
"/" + MACHINE_PUBLISH_DIR +"/" + artifact_name + ";"
-                            command=command+"cp -R --no-dereference
--preserve=links " + \
+                                command=command+"cp -R --no-
dereference --preserve=links " + \
                                              deploy_image_dir + \
                                              "/u-boot* " + DEST +
"/" + MACHINE_PUBLISH_DIR +"/" + artifact_name + ";"
-                        command=command+"cp -R --no-dereference --
preserve=links " + \
+                            command=command+"cp -R --no-dereference
--preserve=links " + \
                                          deploy_image_dir + \
                                          "/*"+artifact+"* " + DEST +
"/" + MACHINE_PUBLISH_DIR +"/" + artifact_name + ";"
-                    command += self.generateMD5cmd(artifact,
deploy_image_dir)
             self.command = command
         else:
             self.command = "echo 'Skipping Step.'"
@@ -241,8 +256,10 @@ class PublishArtifacts(ShellCommand):
         artifact_name = artifact
         if "-lsb" in buildername:
             artifact_name = artifact_name + "-lsb"
-        if artifact_name is "md5sums":
-            deploy_dir_image = os.path.join(self.tmpdir,
"deploy/images/")
+        if "-wic" in buildername:
+            deploy_dir_image =
os.path.join(os.path.join(self.tmpdir, "deploy/wic_images/"),
artifact)
+        elif artifact_name is "md5sums":
+            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.tmpdir, "deploy/images/"), artifact)


[-- Attachment #2: Type: text/html, Size: 16469 bytes --]

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [yocto-autobuilder][PATCH 0/2] publish wic images
  2016-07-06 20:16 [yocto-autobuilder][PATCH 0/2] publish wic images Bill Randle
                   ` (2 preceding siblings ...)
  2016-07-13 21:10 ` [yocto-autobuilder][PATCH 0/2] publish " Randle, William C
@ 2016-07-14 15:53 ` Joshua G Lock
  3 siblings, 0 replies; 7+ messages in thread
From: Joshua G Lock @ 2016-07-14 15:53 UTC (permalink / raw)
  To: Bill Randle, yocto

On Wed, 2016-07-06 at 13:16 -0700, Bill Randle wrote:
> QA started testing wic images in Yocto 2.1, but was building them
> themselves. Have the autobuilder publish the wic images so they are
> available for testing.
> 

Merged to master, thanks.

Joshua

> [YOCTO #9397]
> 
> Bill Randle (2):
>   PublishArtifacts.py: create md5sum files in same dir as artifacts
>   publish build artifacts for wic images
> 
>  buildset-config.controller/nightly-wic.conf        |  8 ++---
>  .../autobuilder/buildsteps/PublishArtifacts.py     | 40
> +++++++++++++++-------
>  2 files changed, 30 insertions(+), 18 deletions(-)
> 


^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2016-07-14 15:53 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-06 20:16 [yocto-autobuilder][PATCH 0/2] publish wic images Bill Randle
2016-07-06 20:16 ` [yocto-autobuilder][PATCH 1/2] PublishArtifacts.py: create md5sum files in same dir as artifacts Bill Randle
2016-07-06 20:16 ` [yocto-autobuilder][PATCH 2/2] publish build artifacts for wic images Bill Randle
2016-07-14  9:38   ` Joshua G Lock
2016-07-14 14:49     ` Randle, William C
2016-07-13 21:10 ` [yocto-autobuilder][PATCH 0/2] publish " Randle, William C
2016-07-14 15:53 ` Joshua G Lock

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.