diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fa8c7be3076c28eba311fa040499b382bba72d84..2e470d91bdfbe9624a01b86015345219a6dc1a77 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -457,17 +457,6 @@ lava-seco-c61-2gb-kselftest: CI_REPORT_JOB_NAME: lava-report CI_SQUAD_PROJECT_NAME: "kselftest" -lava-zephyr-96b-nitrogen-twister: - needs: [zephyr-96b-nitrogen-twister-gcc] - stage: test - extends: .lava-test-scheduled - variables: - MACHINE: 96b-nitrogen - CI_BUILD_JOB_NAME: zephyr-96b-nitrogen-twister-gcc - CI_LAVA_JOB_DEFINITION: "https://git.ostc-eu.org/OSTC/infrastructure/lava/lava-config/-/raw/master/lava.ostc-eu.org/job-definitions/ci/nitrogen-twister.yaml" - CI_REPORT_JOB_NAME: lava-report - CI_SQUAD_PROJECT_NAME: "zephyr" - lava-zephyr-qemu-x86-twister: needs: [zephyr-qemu-x86-twister-gcc] stage: test diff --git a/.oniro-ci/machines-and-flavours.yaml b/.oniro-ci/machines-and-flavours.yaml index db3c3a29bb41eca5b7fcaab43af19dd3a7166e3e..09ccfdcea50ccde4a4460b496c7a170cb9cf37e2 100644 --- a/.oniro-ci/machines-and-flavours.yaml +++ b/.oniro-ci/machines-and-flavours.yaml @@ -215,39 +215,6 @@ zephyr-qemu-cortex-m3-gcc: zephyr-qemu-cortex-m3-clang: extends: [.zephyr-qemu-cortex-m3, .toolchain-clang, .broken] -.zephyr-96b-nitrogen: - extends: .build-zephyr-image - variables: - MACHINE: 96b-nitrogen -zephyr-96b-nitrogen-gcc: - extends: [.zephyr-96b-nitrogen, .toolchain-gcc] -zephyr-96b-nitrogen-clang: - extends: [.zephyr-96b-nitrogen, .toolchain-clang, .broken] - -.zephyr-96b-nitrogen-tests: - extends: .build-zephyr-image - variables: - MACHINE: 96b-nitrogen - CI_ONIRO_RECIPE_NAME: zephyr-kernel-test-all -zephyr-96b-nitrogen-tests-gcc: - extends: [.zephyr-96b-nitrogen-tests, .toolchain-gcc] -zephyr-96b-nitrogen-tests-clang: - extends: [.zephyr-96b-nitrogen-tests, .toolchain-clang, .broken] - -.zephyr-96b-nitrogen-twister: - extends: .build-zephyr-image - variables: - MACHINE: 96b-nitrogen - CI_ONIRO_RECIPE_NAME: zephyr-kernel-test-twister - CI_ONIRO_JOB_ARTIFACTS: "twister*.tar.bz2" - rules: - # Twister tests are somewhat heavy. Run them only on scheduled pipelines. - - if: $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULED_TYPE == "daily" -zephyr-96b-nitrogen-twister-gcc: - extends: [.zephyr-96b-nitrogen-twister, .toolchain-gcc] -zephyr-96b-nitrogen-twister-clang: - extends: [.zephyr-96b-nitrogen-twister, .toolchain-clang, .broken] - .zephyr-qemu-x86-twister: extends: .build-zephyr-image variables: