* [PATCH 1/4] kas/base.yml: rename ptest fragment to noptest
@ 2021-04-15 9:29 Ross Burton
2021-04-15 9:29 ` [PATCH 2/4] CI: make update-repos a bit more verbose Ross Burton
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Ross Burton @ 2021-04-15 9:29 UTC (permalink / raw)
To: meta-arm
Change-Id: Ib670ba8715ff128345e631652d4cae8d76ba0812
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
kas/base.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kas/base.yml b/kas/base.yml
index 0570a36..2a12a86 100644
--- a/kas/base.yml
+++ b/kas/base.yml
@@ -35,7 +35,7 @@ local_conf_header:
PACKAGECONFIG_append_pn-perf = " coresight"
ERROR_QA = "${WARN_QA}"
INHERIT_remove = "uninative"
- ptest: |
+ noptest: |
DISTRO_FEATURES_remove = "ptest"
machine: unset
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/4] CI: make update-repos a bit more verbose
2021-04-15 9:29 [PATCH 1/4] kas/base.yml: rename ptest fragment to noptest Ross Burton
@ 2021-04-15 9:29 ` Ross Burton
2021-04-15 9:29 ` [PATCH 3/4] CI: don't disable uninative Ross Burton
2021-04-15 9:29 ` [PATCH 4/4] Rename top-level kas/ to ci/ Ross Burton
2 siblings, 0 replies; 4+ messages in thread
From: Ross Burton @ 2021-04-15 9:29 UTC (permalink / raw)
To: meta-arm
Change-Id: Ibb7b652b13b6d036c36fce076e7c1807f2ff37d7
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
kas/update-repos | 2 ++
1 file changed, 2 insertions(+)
diff --git a/kas/update-repos b/kas/update-repos
index 48711e3..a68257b 100755
--- a/kas/update-repos
+++ b/kas/update-repos
@@ -36,6 +36,8 @@ if __name__ == "__main__":
for repo in repositories:
repodir = base_repodir / repo_shortname(repo)
if repodir.exists():
+ print("Updating %s..." % repo)
subprocess.run(["git", "-C", repodir, "fetch"], check=True)
else:
+ print("Cloning %s..." % repo)
subprocess.run(["git", "clone", "--bare", repo, repodir], check=True)
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 3/4] CI: don't disable uninative
2021-04-15 9:29 [PATCH 1/4] kas/base.yml: rename ptest fragment to noptest Ross Burton
2021-04-15 9:29 ` [PATCH 2/4] CI: make update-repos a bit more verbose Ross Burton
@ 2021-04-15 9:29 ` Ross Burton
2021-04-15 9:29 ` [PATCH 4/4] Rename top-level kas/ to ci/ Ross Burton
2 siblings, 0 replies; 4+ messages in thread
From: Ross Burton @ 2021-04-15 9:29 UTC (permalink / raw)
To: meta-arm
We previously disabled uninative[1] because it broke builds in the
Docker containers. This has now been fixed in oe-core with uninative 3.0
so this workaround can be removed.
[1] e5523d626f58c2eeec6b1133395cbcfccd5d9319
Change-Id: I40975eb46737e66dab9f9b8cc63a9283d79918fb
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
kas/base.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/kas/base.yml b/kas/base.yml
index 2a12a86..a97da9b 100644
--- a/kas/base.yml
+++ b/kas/base.yml
@@ -34,7 +34,6 @@ local_conf_header:
INHERIT += "rm_work"
PACKAGECONFIG_append_pn-perf = " coresight"
ERROR_QA = "${WARN_QA}"
- INHERIT_remove = "uninative"
noptest: |
DISTRO_FEATURES_remove = "ptest"
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 4/4] Rename top-level kas/ to ci/
2021-04-15 9:29 [PATCH 1/4] kas/base.yml: rename ptest fragment to noptest Ross Burton
2021-04-15 9:29 ` [PATCH 2/4] CI: make update-repos a bit more verbose Ross Burton
2021-04-15 9:29 ` [PATCH 3/4] CI: don't disable uninative Ross Burton
@ 2021-04-15 9:29 ` Ross Burton
2 siblings, 0 replies; 4+ messages in thread
From: Ross Burton @ 2021-04-15 9:29 UTC (permalink / raw)
To: meta-arm
The files in kas/ are not generic Kas files, but instead designed
specifically and solely around the CI system.
Change-Id: I30082392ad2231a4c1c41e54a292595adf81715b
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
.gitlab-ci.yml | 10 +++++-----
{kas => ci}/armgcc.yml | 0
{kas => ci}/base.yml | 0
{kas => ci}/bootstrap.yml | 0
{kas => ci}/check-machine-coverage | 2 +-
{kas => ci}/check-warnings | 0
{kas => ci}/clang.yml | 0
{kas => ci}/corstone500.yml | 0
{kas => ci}/corstone700-fvp.yml | 0
{kas => ci}/corstone700-mps3.yml | 0
{kas => ci}/external-gcc-arm32.yml | 0
{kas => ci}/fvp-base-arm32.yml | 0
{kas => ci}/fvp-base.yml | 0
{kas => ci}/fvp-baser-aemv8r64.yml | 0
{kas => ci}/gem5-arm64-xen.yml | 0
{kas => ci}/gem5-arm64.yml | 0
{kas => ci}/generic-arm64.yml | 0
{kas => ci}/jobs-to-kas | 4 ++--
{kas => ci}/juno.yml | 0
{kas => ci}/logging.yml | 0
{kas => ci}/meta-python.yml | 0
{kas => ci}/meta-zephyr.yml | 0
{kas => ci}/microbit-v1.yml | 0
{kas => ci}/musca-b1.yml | 0
{kas => ci}/musca-s1.yml | 0
{kas => ci}/musl.yml | 0
{kas => ci}/n1sdp.yml | 0
{kas => ci}/qemu-cortex-a53.yml | 0
{kas => ci}/qemuarm.yml | 0
{kas => ci}/qemuarm64-sbsa.yml | 0
{kas => ci}/qemuarm64-secureboot.yml | 0
{kas => ci}/qemuarmv5.yml | 0
{kas => ci}/sgi575.yml | 0
{kas => ci}/tc0.yml | 0
{kas => ci}/update-repos | 0
35 files changed, 8 insertions(+), 8 deletions(-)
rename {kas => ci}/armgcc.yml (100%)
rename {kas => ci}/base.yml (100%)
rename {kas => ci}/bootstrap.yml (100%)
rename {kas => ci}/check-machine-coverage (94%)
rename {kas => ci}/check-warnings (100%)
rename {kas => ci}/clang.yml (100%)
rename {kas => ci}/corstone500.yml (100%)
rename {kas => ci}/corstone700-fvp.yml (100%)
rename {kas => ci}/corstone700-mps3.yml (100%)
rename {kas => ci}/external-gcc-arm32.yml (100%)
rename {kas => ci}/fvp-base-arm32.yml (100%)
rename {kas => ci}/fvp-base.yml (100%)
rename {kas => ci}/fvp-baser-aemv8r64.yml (100%)
rename {kas => ci}/gem5-arm64-xen.yml (100%)
rename {kas => ci}/gem5-arm64.yml (100%)
rename {kas => ci}/generic-arm64.yml (100%)
rename {kas => ci}/jobs-to-kas (83%)
rename {kas => ci}/juno.yml (100%)
rename {kas => ci}/logging.yml (100%)
rename {kas => ci}/meta-python.yml (100%)
rename {kas => ci}/meta-zephyr.yml (100%)
rename {kas => ci}/microbit-v1.yml (100%)
rename {kas => ci}/musca-b1.yml (100%)
rename {kas => ci}/musca-s1.yml (100%)
rename {kas => ci}/musl.yml (100%)
rename {kas => ci}/n1sdp.yml (100%)
rename {kas => ci}/qemu-cortex-a53.yml (100%)
rename {kas => ci}/qemuarm.yml (100%)
rename {kas => ci}/qemuarm64-sbsa.yml (100%)
rename {kas => ci}/qemuarm64-secureboot.yml (100%)
rename {kas => ci}/qemuarmv5.yml (100%)
rename {kas => ci}/sgi575.yml (100%)
rename {kas => ci}/tc0.yml (100%)
rename {kas => ci}/update-repos (100%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 732589b..fec2890 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,7 +15,7 @@ stages:
KAS_REPO_REF_DIR: $CI_BUILDS_DIR/persist/repos
SSTATE_DIR: $CI_BUILDS_DIR/persist/sstate
DL_DIR: $CI_BUILDS_DIR/persist/downloads
- BB_LOGCONFIG: $CI_PROJECT_DIR/kas/logging.yml
+ BB_LOGCONFIG: $CI_PROJECT_DIR/ci/logging.yml
before_script:
- echo KAS_WORK_DIR = $KAS_WORK_DIR
- echo SSTATE_DIR = $SSTATE_DIR
@@ -26,10 +26,10 @@ stages:
.build:
extends: .setup
script:
- - KASFILES=$(kas/jobs-to-kas $CI_JOB_NAME)
+ - KASFILES=$(./ci/jobs-to-kas $CI_JOB_NAME)
- kas shell --update --force-checkout $KASFILES -c 'cat conf/*.conf'
- kas build $KASFILES
- - ./kas/check-warnings $KAS_WORK_DIR/build/warnings.log
+ - ./ci/check-warnings $KAS_WORK_DIR/build/warnings.log
#
@@ -39,7 +39,7 @@ update-repos:
extends: .setup
stage: prep
script:
- - flock --verbose --timeout 60 $KAS_REPO_REF_DIR ./kas/update-repos
+ - flock --verbose --timeout 60 $KAS_REPO_REF_DIR ./ci/update-repos
#
@@ -56,7 +56,7 @@ n1sdp/bootstrap:
machine-coverage:
stage: bootstrap
script:
- - ./kas/check-machine-coverage
+ - ./ci/check-machine-coverage
coverage: '/Coverage: \d+/'
diff --git a/kas/armgcc.yml b/ci/armgcc.yml
similarity index 100%
rename from kas/armgcc.yml
rename to ci/armgcc.yml
diff --git a/kas/base.yml b/ci/base.yml
similarity index 100%
rename from kas/base.yml
rename to ci/base.yml
diff --git a/kas/bootstrap.yml b/ci/bootstrap.yml
similarity index 100%
rename from kas/bootstrap.yml
rename to ci/bootstrap.yml
diff --git a/kas/check-machine-coverage b/ci/check-machine-coverage
similarity index 94%
rename from kas/check-machine-coverage
rename to ci/check-machine-coverage
index 53d3983..035d421 100755
--- a/kas/check-machine-coverage
+++ b/ci/check-machine-coverage
@@ -14,7 +14,7 @@ machines = metaarm.glob("meta-*/conf/machine/*.conf")
machines = set(p.stem for p in machines)
# All kas files
-kas = metaarm.glob("kas/*.yml")
+kas = metaarm.glob("ci/*.yml")
kas = set(p.stem for p in kas)
missing = machines - kas
diff --git a/kas/check-warnings b/ci/check-warnings
similarity index 100%
rename from kas/check-warnings
rename to ci/check-warnings
diff --git a/kas/clang.yml b/ci/clang.yml
similarity index 100%
rename from kas/clang.yml
rename to ci/clang.yml
diff --git a/kas/corstone500.yml b/ci/corstone500.yml
similarity index 100%
rename from kas/corstone500.yml
rename to ci/corstone500.yml
diff --git a/kas/corstone700-fvp.yml b/ci/corstone700-fvp.yml
similarity index 100%
rename from kas/corstone700-fvp.yml
rename to ci/corstone700-fvp.yml
diff --git a/kas/corstone700-mps3.yml b/ci/corstone700-mps3.yml
similarity index 100%
rename from kas/corstone700-mps3.yml
rename to ci/corstone700-mps3.yml
diff --git a/kas/external-gcc-arm32.yml b/ci/external-gcc-arm32.yml
similarity index 100%
rename from kas/external-gcc-arm32.yml
rename to ci/external-gcc-arm32.yml
diff --git a/kas/fvp-base-arm32.yml b/ci/fvp-base-arm32.yml
similarity index 100%
rename from kas/fvp-base-arm32.yml
rename to ci/fvp-base-arm32.yml
diff --git a/kas/fvp-base.yml b/ci/fvp-base.yml
similarity index 100%
rename from kas/fvp-base.yml
rename to ci/fvp-base.yml
diff --git a/kas/fvp-baser-aemv8r64.yml b/ci/fvp-baser-aemv8r64.yml
similarity index 100%
rename from kas/fvp-baser-aemv8r64.yml
rename to ci/fvp-baser-aemv8r64.yml
diff --git a/kas/gem5-arm64-xen.yml b/ci/gem5-arm64-xen.yml
similarity index 100%
rename from kas/gem5-arm64-xen.yml
rename to ci/gem5-arm64-xen.yml
diff --git a/kas/gem5-arm64.yml b/ci/gem5-arm64.yml
similarity index 100%
rename from kas/gem5-arm64.yml
rename to ci/gem5-arm64.yml
diff --git a/kas/generic-arm64.yml b/ci/generic-arm64.yml
similarity index 100%
rename from kas/generic-arm64.yml
rename to ci/generic-arm64.yml
diff --git a/kas/jobs-to-kas b/ci/jobs-to-kas
similarity index 83%
rename from kas/jobs-to-kas
rename to ci/jobs-to-kas
index d1f2f10..7057970 100755
--- a/kas/jobs-to-kas
+++ b/ci/jobs-to-kas
@@ -8,8 +8,8 @@ set -e -u
# Read Job namne from $1 and split on /
IFS=/ read -r -a PARTS<<<$1
-# Prefix each part with kas/
-PARTS=("${PARTS[@]/#/kas/}")
+# Prefix each part with ci/
+PARTS=("${PARTS[@]/#/ci/}")
# Suffix each part with .yml
PARTS=("${PARTS[@]/%/.yml}")
diff --git a/kas/juno.yml b/ci/juno.yml
similarity index 100%
rename from kas/juno.yml
rename to ci/juno.yml
diff --git a/kas/logging.yml b/ci/logging.yml
similarity index 100%
rename from kas/logging.yml
rename to ci/logging.yml
diff --git a/kas/meta-python.yml b/ci/meta-python.yml
similarity index 100%
rename from kas/meta-python.yml
rename to ci/meta-python.yml
diff --git a/kas/meta-zephyr.yml b/ci/meta-zephyr.yml
similarity index 100%
rename from kas/meta-zephyr.yml
rename to ci/meta-zephyr.yml
diff --git a/kas/microbit-v1.yml b/ci/microbit-v1.yml
similarity index 100%
rename from kas/microbit-v1.yml
rename to ci/microbit-v1.yml
diff --git a/kas/musca-b1.yml b/ci/musca-b1.yml
similarity index 100%
rename from kas/musca-b1.yml
rename to ci/musca-b1.yml
diff --git a/kas/musca-s1.yml b/ci/musca-s1.yml
similarity index 100%
rename from kas/musca-s1.yml
rename to ci/musca-s1.yml
diff --git a/kas/musl.yml b/ci/musl.yml
similarity index 100%
rename from kas/musl.yml
rename to ci/musl.yml
diff --git a/kas/n1sdp.yml b/ci/n1sdp.yml
similarity index 100%
rename from kas/n1sdp.yml
rename to ci/n1sdp.yml
diff --git a/kas/qemu-cortex-a53.yml b/ci/qemu-cortex-a53.yml
similarity index 100%
rename from kas/qemu-cortex-a53.yml
rename to ci/qemu-cortex-a53.yml
diff --git a/kas/qemuarm.yml b/ci/qemuarm.yml
similarity index 100%
rename from kas/qemuarm.yml
rename to ci/qemuarm.yml
diff --git a/kas/qemuarm64-sbsa.yml b/ci/qemuarm64-sbsa.yml
similarity index 100%
rename from kas/qemuarm64-sbsa.yml
rename to ci/qemuarm64-sbsa.yml
diff --git a/kas/qemuarm64-secureboot.yml b/ci/qemuarm64-secureboot.yml
similarity index 100%
rename from kas/qemuarm64-secureboot.yml
rename to ci/qemuarm64-secureboot.yml
diff --git a/kas/qemuarmv5.yml b/ci/qemuarmv5.yml
similarity index 100%
rename from kas/qemuarmv5.yml
rename to ci/qemuarmv5.yml
diff --git a/kas/sgi575.yml b/ci/sgi575.yml
similarity index 100%
rename from kas/sgi575.yml
rename to ci/sgi575.yml
diff --git a/kas/tc0.yml b/ci/tc0.yml
similarity index 100%
rename from kas/tc0.yml
rename to ci/tc0.yml
diff --git a/kas/update-repos b/ci/update-repos
similarity index 100%
rename from kas/update-repos
rename to ci/update-repos
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-04-15 9:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-15 9:29 [PATCH 1/4] kas/base.yml: rename ptest fragment to noptest Ross Burton
2021-04-15 9:29 ` [PATCH 2/4] CI: make update-repos a bit more verbose Ross Burton
2021-04-15 9:29 ` [PATCH 3/4] CI: don't disable uninative Ross Burton
2021-04-15 9:29 ` [PATCH 4/4] Rename top-level kas/ to ci/ Ross Burton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).