diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 732589bc..fec28909 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 53d39832..035d4219 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 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/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