diff mbox series

[auto-upgrade-helper] upgrade-helper: fix testimage check

Message ID 20240527203230.1258788-1-tgamblin@baylibre.com
State New
Headers show
Series [auto-upgrade-helper] upgrade-helper: fix testimage check | expand

Commit Message

Trevor Gamblin May 27, 2024, 8:32 p.m. UTC 
From: Trevor Gamblin <tgamblin@baylibre.com>

AUH's testimage logic is still checking for BB_ENV_EXTRAWHITE instead of
BB_ENV_PASSTHROUGH_ADDITIONS, and INHERIT += "testimage" instead of
IMAGE_CLASSES += "testimage". Update it so that checks for the correct
variable names.

Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
---
 modules/testimage.py | 2 +-
 upgrade-helper.py    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

Comments

Alexander Kanavin May 27, 2024, 8:36 p.m. UTC | #1 
On Mon, 27 May 2024 at 22:32, Trevor Gamblin via
lists.yoctoproject.org <tgamblin=baylibre.com@lists.yoctoproject.org>
wrote:
>
> From: Trevor Gamblin <tgamblin@baylibre.com>

Yay! What did you do? We need to update the yocto docs with a
bulletproof configuration for git.

Alex
Trevor Gamblin May 27, 2024, 8:39 p.m. UTC | #2 
On 2024-05-27 4:36 p.m., Alexander Kanavin wrote:
> On Mon, 27 May 2024 at 22:32, Trevor Gamblin via
> lists.yoctoproject.org <tgamblin=baylibre.com@lists.yoctoproject.org>
> wrote:
>> From: Trevor Gamblin <tgamblin@baylibre.com>
> Yay! What did you do? We need to update the yocto docs with a
> bulletproof configuration for git.

I used the --from option with git send-email, but following these 
instructions also seems to work:

https://docs.yoctoproject.org/contributor-guide/submit-changes.html#fixing-your-from-identity

My problem was that I had both my username *and* email address in my 
sendemail.from variable in .gitconfig.

In case anyone else is reading this chain, there was also this thread: 
https://lists.yoctoproject.org/g/docs/topic/105864996

>
> Alex
diff mbox series

Patch

diff --git a/modules/testimage.py b/modules/testimage.py
index 0fc1adb..fb2e467 100644
--- a/modules/testimage.py
+++ b/modules/testimage.py
@@ -53,7 +53,7 @@  class TestImage():
         self.logdir = os.path.join(uh_work_dir, "testimage-logs")
         os.mkdir(self.logdir)
 
-        os.environ['BB_ENV_EXTRAWHITE'] = os.environ['BB_ENV_EXTRAWHITE'] + \
+        os.environ['BB_ENV_PASSTHROUGH_ADDITIONS'] = os.environ['BB_ENV_PASSTHROUGH_ADDITIONS'] + \
             " CORE_IMAGE_EXTRA_INSTALL TEST_LOG_DIR TESTIMAGE_UPDATE_VARS"
 
     def _get_pkgs_to_install(self, pkgs):
diff --git a/upgrade-helper.py b/upgrade-helper.py
index 869dc3f..e307d60 100755
--- a/upgrade-helper.py
+++ b/upgrade-helper.py
@@ -262,7 +262,7 @@  class Updater(object):
         enabled = False
 
         if settings.get("testimage", "no") == "yes":
-            if 'testimage' in self.base_env['INHERIT']:
+            if 'testimage' in self.base_env['IMAGE_CLASSES']:
                 if not "ptest" in self.base_env["DISTRO_FEATURES"]:
                     E(" testimage requires ptest in DISTRO_FEATURES please add to"\
                       " conf/local.conf.")
@@ -271,8 +271,8 @@  class Updater(object):
                 enabled = True
             else:
                 E(" testimage was enabled in upgrade-helper.conf"\
-                  " but isn't INHERIT in conf/local.conf, if you want"\
-                  " to enable please set.")
+                  " but isn't added to IMAGE_CLASSES in conf/local.conf, \
+                    if you want to enable please set.")
                 exit(1)
 
         return enabled