From cfd4f06db68a838a057fa74cadcf90bc61e4787a Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Fri, 23 Apr 2021 10:01:52 -0400 Subject: [PATCH] Rename top-level kas/ to ci/ 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 Signed-off-by: Jon Mason --- .gitlab-ci.yml | 10 +++++----- {kas => ci}/a5ds.yml | 0 {kas => ci}/armgcc.yml | 0 {kas => ci}/base.yml | 0 {kas => ci}/bootstrap.yml | 0 {kas => ci}/check-machine-coverage | 8 ++++---- {kas => ci}/check-warnings | 0 {kas => ci}/clang.yml | 0 {kas => ci}/foundation-armv8.yml | 0 {kas => ci}/fvp-base.yml | 0 {kas => ci}/gem5-arm64.yml | 0 {kas => ci}/jobs-to-kas | 4 ++-- {kas => ci}/juno.yml | 0 {kas => ci}/logging.yml | 0 {kas => ci}/musl.yml | 0 {kas => ci}/n1sdp.yml | 0 {kas => ci}/qemuarm.yml | 0 {kas => ci}/qemuarmv5.yml | 0 {kas => ci}/tc0.yml | 0 {kas => ci}/update-repos | 0 20 files changed, 11 insertions(+), 11 deletions(-) rename {kas => ci}/a5ds.yml (100%) rename {kas => ci}/armgcc.yml (100%) rename {kas => ci}/base.yml (100%) rename {kas => ci}/bootstrap.yml (100%) rename {kas => ci}/check-machine-coverage (82%) rename {kas => ci}/check-warnings (100%) rename {kas => ci}/clang.yml (100%) rename {kas => ci}/foundation-armv8.yml (100%) rename {kas => ci}/fvp-base.yml (100%) rename {kas => ci}/gem5-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}/musl.yml (100%) rename {kas => ci}/n1sdp.yml (100%) rename {kas => ci}/qemuarm.yml (100%) rename {kas => ci}/qemuarmv5.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 527ec9e7..3f9e737e 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/a5ds.yml b/ci/a5ds.yml similarity index 100% rename from kas/a5ds.yml rename to ci/a5ds.yml 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 82% rename from kas/check-machine-coverage rename to ci/check-machine-coverage index 53d39832..a1dc3915 100755 --- a/kas/check-machine-coverage +++ b/ci/check-machine-coverage @@ -13,11 +13,11 @@ if metaarm.name != "meta-arm": machines = metaarm.glob("meta-*/conf/machine/*.conf") machines = set(p.stem for p in machines) -# All kas files -kas = metaarm.glob("kas/*.yml") -kas = set(p.stem for p in kas) +# All ci files +ci = metaarm.glob("ci/*.yml") +ci = set(p.stem for p in ci) -missing = machines - kas +missing = machines - ci print(f"The following machines are missing: {', '.join(sorted(missing))}.") covered = len(machines) - len(missing) 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/foundation-armv8.yml b/ci/foundation-armv8.yml similarity index 100% rename from kas/foundation-armv8.yml rename to ci/foundation-armv8.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/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/jobs-to-kas b/ci/jobs-to-kas similarity index 83% rename from kas/jobs-to-kas rename to ci/jobs-to-kas index d1f2f108..70579703 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/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/qemuarm.yml b/ci/qemuarm.yml similarity index 100% rename from kas/qemuarm.yml rename to ci/qemuarm.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/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