diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2023-09-11 15:36:15 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2023-09-11 15:36:15 +0300 |
| commit | 80d41842d41c701edac5b2c768da574f260fa6a3 (patch) | |
| tree | 7d58015c844bd241f3c1737b1af0d4b53dfe8c67 /meta-arm/ci | |
| parent | fc7e7973f3119e2bad511209aa336537dc5ffbed (diff) | |
| download | openbmc-80d41842d41c701edac5b2c768da574f260fa6a3.tar.xz | |
Revert "subtree updates"
Needs to go through CI
This reverts commit fc7e7973f3119e2bad511209aa336537dc5ffbed.
Diffstat (limited to 'meta-arm/ci')
| -rw-r--r-- | meta-arm/ci/corstone500.yml | 12 | ||||
| -rw-r--r-- | meta-arm/ci/fvps.yml | 1 | ||||
| -rwxr-xr-x | meta-arm/ci/jobs-to-kas | 2 | ||||
| -rw-r--r-- | meta-arm/ci/n1sdp-optee.yml | 12 |
4 files changed, 14 insertions, 13 deletions
diff --git a/meta-arm/ci/corstone500.yml b/meta-arm/ci/corstone500.yml new file mode 100644 index 0000000000..2172bc1f55 --- /dev/null +++ b/meta-arm/ci/corstone500.yml @@ -0,0 +1,12 @@ +header: + version: 14 + includes: + - ci/base.yml + - ci/fvp.yml + - ci/poky-tiny.yml + +local_conf_header: + fvp-config: | + IMAGE_FEATURES:remove = " ssh-server-dropbear" + +machine: corstone500 diff --git a/meta-arm/ci/fvps.yml b/meta-arm/ci/fvps.yml index 1bced2994e..cf4103edb1 100644 --- a/meta-arm/ci/fvps.yml +++ b/meta-arm/ci/fvps.yml @@ -15,6 +15,7 @@ local_conf_header: target: - nativesdk-fvp-base-a-aem + - nativesdk-fvp-corstone500 - nativesdk-fvp-corstone1000 - nativesdk-fvp-n1-edge - nativesdk-fvp-sgi575 diff --git a/meta-arm/ci/jobs-to-kas b/meta-arm/ci/jobs-to-kas index eea6e4635b..b8615a5ff5 100755 --- a/meta-arm/ci/jobs-to-kas +++ b/meta-arm/ci/jobs-to-kas @@ -3,7 +3,7 @@ # This script is expecting an input of machine name, optionally followed by a # colon and a list of one or more parameters separated by commas between # brackets. For example, the following are acceptable: -# corstone1000-mps3 +# corstone500 # fvp-base: [testimage] # qemuarm64-secureboot: [clang, glibc, testimage] # diff --git a/meta-arm/ci/n1sdp-optee.yml b/meta-arm/ci/n1sdp-optee.yml deleted file mode 100644 index f2b50abf49..0000000000 --- a/meta-arm/ci/n1sdp-optee.yml +++ /dev/null @@ -1,12 +0,0 @@ -header: - version: 14 - -# Config specific for the optee-xtests -local_conf_header: - optee-test: | - # Include ARM FFA - MACHINE_FEATURES:append = " arm-ffa" - # Include trusted services - TEST_SUITES:append = " trusted_services" - # Include Optee xtests - IMAGE_INSTALL:append = " optee-test" |