[PATCH 1/3] CI: pass --update and --force-checkout to kas in pending-updates job

[PATCH 1/3] CI: pass --update and --force-checkout to kas in pending-updates job

[Ross Burton]

This job doesn't use the standard helpers, so needs to pass these
explicitly otherwise it can pick up an old SHA.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 09ca8c41..3649060e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -221,7 +221,7 @@ pending-updates:
   script:
     - rm -fr update-report
     # This configuration has all of the layers we need enabled
-    - kas shell ci/qemuarm64.yml:ci/meta-openembedded.yml --command \
+    - kas shell --update --force-checkout ci/qemuarm64.yml:ci/meta-openembedded.yml --command \
       "$CI_PROJECT_DIR/scripts/machine-summary.py -t report -o $CI_PROJECT_DIR/update-report $($CI_PROJECT_DIR/ci/listmachines.py meta-arm meta-arm-bsp)"
   # Do this on x86 whilst the compilers are x86-only
   tags:
-- 
2.34.1

[PATCH 2/3] CI: use 'kas dump' instead of manually catting files

[Ross Burton]

Kas 3.2 has a 'dump' plugin, so use that instead of cat in a shell.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3649060e..0abf7e8d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,7 +45,7 @@ stages:
     KUBERNETES_CPU_REQUEST: $CPU_REQUEST
   script:
     - KASFILES=$(./ci/jobs-to-kas "$CI_JOB_NAME")
-    - kas shell --update --force-checkout $KASFILES -c 'cat conf/*.conf'
+    - kas dump --update --force-checkout --resolve-refs --resolve-env $KASFILES 
     - kas build $KASFILES
     - ./ci/check-warnings $KAS_WORK_DIR/build/warnings.log
   artifacts:
-- 
2.34.1

[PATCH 3/3] CI: remove obsolete install

[Ross Burton]

Kas 3.2 ships python3-subunit, so we don't need to try to install that
anymore.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .gitlab-ci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0abf7e8d..d61443df 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,8 +35,6 @@ stages:
     - mkdir --verbose --parents $KAS_WORK_DIR $KAS_REPO_REF_DIR $SSTATE_DIR $DL_DIR $TOOLCHAIN_DIR $TOOLCHAIN_LINK_DIR
     # Must do this here, as it's the only way to make sure the toolchain is installed on the same builder
     - ./ci/get-binary-toolchains $DL_DIR $TOOLCHAIN_DIR $TOOLCHAIN_LINK_DIR
-    # This can be removed with Kas 3.2
-    - sudo apt-get update && sudo apt-get install --yes python3-subunit
 
 # Generalised fragment to do a Kas build
 .build:
-- 
2.34.1

Re: [PATCH 1/3] CI: pass --update and --force-checkout to kas in pending-updates job

[Jon Mason]

On Wed, 18 Jan 2023 15:41:21 +0000, Ross Burton wrote:
> This job doesn't use the standard helpers, so needs to pass these
> explicitly otherwise it can pick up an old SHA.

Applied, thanks!

[1/3] CI: pass --update and --force-checkout to kas in pending-updates job
      commit: 6b98584ae3cb91e1302aff7c705c5cd3f176e939
[2/3] CI: use 'kas dump' instead of manually catting files
      commit: 513d085a169d84d140220d7167f59ad8b6302662
[3/3] CI: remove obsolete install
      commit: dc36e1de6b3211095bd40db39084f9626aba4675

Best regards,
-- 
Jon Mason <jon.mason@arm.com>

Re: [PATCH 1/3] CI: pass --update and --force-checkout to kas in pending-updates job

[Jon Mason]

On Wed, 18 Jan 2023 15:41:21 +0000, Ross Burton wrote:
> This job doesn't use the standard helpers, so needs to pass these
> explicitly otherwise it can pick up an old SHA.

Applied, thanks!

[1/3] CI: pass --update and --force-checkout to kas in pending-updates job
      commit: 6b98584ae3cb91e1302aff7c705c5cd3f176e939
[2/3] CI: use 'kas dump' instead of manually catting files
      commit: 513d085a169d84d140220d7167f59ad8b6302662
[3/3] CI: remove obsolete install
      commit: dc36e1de6b3211095bd40db39084f9626aba4675

Best regards,
-- 
Jon Mason <jon.mason@arm.com>