Browse Source

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 <ross.burton@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
Ross Burton 4 years ago
parent
commit
e3bfb5d746

+ 5 - 5
.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+/'
 
 

+ 0 - 0
kas/armgcc.yml → ci/armgcc.yml


+ 0 - 0
kas/base.yml → ci/base.yml


+ 0 - 0
kas/bootstrap.yml → ci/bootstrap.yml


+ 1 - 1
kas/check-machine-coverage → 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

+ 0 - 0
kas/check-warnings → ci/check-warnings


+ 0 - 0
kas/clang.yml → ci/clang.yml


+ 0 - 0
kas/corstone500.yml → ci/corstone500.yml


+ 0 - 0
kas/corstone700-fvp.yml → ci/corstone700-fvp.yml


+ 0 - 0
kas/corstone700-mps3.yml → ci/corstone700-mps3.yml


+ 0 - 0
kas/external-gcc-arm32.yml → ci/external-gcc-arm32.yml


+ 0 - 0
kas/fvp-base-arm32.yml → ci/fvp-base-arm32.yml


+ 0 - 0
kas/fvp-base.yml → ci/fvp-base.yml


+ 0 - 0
kas/fvp-baser-aemv8r64.yml → ci/fvp-baser-aemv8r64.yml


+ 0 - 0
kas/gem5-arm64-xen.yml → ci/gem5-arm64-xen.yml


+ 0 - 0
kas/gem5-arm64.yml → ci/gem5-arm64.yml


+ 0 - 0
kas/generic-arm64.yml → ci/generic-arm64.yml


+ 2 - 2
kas/jobs-to-kas → 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}")

+ 0 - 0
kas/juno.yml → ci/juno.yml


+ 0 - 0
kas/logging.yml → ci/logging.yml


+ 0 - 0
kas/meta-python.yml → ci/meta-python.yml


+ 0 - 0
kas/meta-zephyr.yml → ci/meta-zephyr.yml


+ 0 - 0
kas/microbit-v1.yml → ci/microbit-v1.yml


+ 0 - 0
kas/musca-b1.yml → ci/musca-b1.yml


+ 0 - 0
kas/musca-s1.yml → ci/musca-s1.yml


+ 0 - 0
kas/musl.yml → ci/musl.yml


+ 0 - 0
kas/n1sdp.yml → ci/n1sdp.yml


+ 0 - 0
kas/qemu-cortex-a53.yml → ci/qemu-cortex-a53.yml


+ 0 - 0
kas/qemuarm.yml → ci/qemuarm.yml


+ 0 - 0
kas/qemuarm64-sbsa.yml → ci/qemuarm64-sbsa.yml


+ 0 - 0
kas/qemuarm64-secureboot.yml → ci/qemuarm64-secureboot.yml


+ 0 - 0
kas/qemuarmv5.yml → ci/qemuarmv5.yml


+ 0 - 0
kas/sgi575.yml → ci/sgi575.yml


+ 0 - 0
kas/tc0.yml → ci/tc0.yml


+ 0 - 0
kas/update-repos → ci/update-repos