ci: remove clang workflow, use main twister workflow to build using llvm

.github/workflows/twister.yaml

@@ -46,10 +46,11 @@ jobs:
       BSIM_COMPONENTS_PATH: /opt/bsim/components
       TWISTER_COMMON: '--no-detailed-test-id --force-color --inline-logs -v -N -M --retry-failed 3 --timeout-multiplier 2 '
       WEEKLY_OPTIONS: ' -M --build-only --all --show-footprint --report-filtered'
-      PR_OPTIONS: ' --clobber-output --integration'
+      PR_OPTIONS: ' --clobber-output --integration --force-platform-toolchain native_sim/native:llvm '
       PUSH_OPTIONS: ' --clobber-output -M --show-footprint --report-filtered'
       COMMIT_RANGE: ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }}
       BASE_REF: ${{ github.base_ref }}
+      LLVM_TOOLCHAIN_PATH: /usr/lib/llvm-16
     steps:
       - name: Print cloud service information
         run: |
@@ -149,11 +150,19 @@ jobs:
           export ZEPHYR_BASE=${PWD}
           export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
           python3 ./scripts/ci/test_plan.py -c origin/${BASE_REF}.. --pull-request --no-detailed-test-id
-          ./scripts/twister --subset ${{matrix.subset}}/${{ strategy.job-total }} --load-tests testplan.json ${TWISTER_COMMON} ${PR_OPTIONS}
+          ./scripts/twister \
+            --subset ${{matrix.subset}}/${{ strategy.job-total }} \
+            --load-tests testplan.json \
+            ${TWISTER_COMMON} \
+            ${PR_OPTIONS}
           if [ "${{matrix.subset}}" = "1" -a ${{needs.twister-build-prep.outputs.fullrun}} = 'True' ]; then
             ./scripts/zephyr_module.py --twister-out module_tests.args
             if [ -s module_tests.args ]; then
-              ./scripts/twister +module_tests.args --outdir module_tests ${TWISTER_COMMON} ${PR_OPTIONS}
+              ./scripts/twister \
+                +module_tests.args \
+                --outdir module_tests \
+                ${TWISTER_COMMON} \
+                ${PR_OPTIONS}
             fi
           fi
 

scripts/pylib/twister/twisterlib/environment.py

@@ -431,6 +431,11 @@ def add_parse_arguments(parser = None) -> argparse.ArgumentParser:
                         help="Do not filter based on toolchain, use the set "
                              " toolchain unconditionally")
 
+    parser.add_argument("--force-platform-toolchain", action="append",
+                        help="Force a toolchain variant for a platform in the "
+                             "form of <platform>:<toolchain variant>. "
+                             "(Can be specified multiple time)")
+
     parser.add_argument("--gcov-tool", type=Path, default=None,
                         help="Path to the gcov tool to use for code coverage "
                              "reports")

scripts/pylib/twister/twisterlib/runner.py

@@ -645,8 +645,13 @@ def run_cmake(self, args="", filter_stages=None):
             f'-D{warning_command}={warnings_as_errors}',
             f'-DEXTRA_GEN_EDT_ARGS={gen_edt_args}',
             f'-G{self.env.generator}',
-            f'-DPython3_EXECUTABLE={pathlib.Path(sys.executable).as_posix()}'
+            f'-DPython3_EXECUTABLE={pathlib.Path(sys.executable).as_posix()}',
         ]
+        if self.env.options.force_platform_toolchain:
+            for e in self.env.options.force_platform_toolchain:
+                platform, variant = e.split(":")
+                if platform and variant and self.platform.name == platform:
+                    cmake_args.append(f'-DZEPHYR_TOOLCHAIN_VARIANT={variant}')
 
         # If needed, run CMake using the package_helper script first, to only run
         # a subset of all cmake modules. This output will be used to filter

scripts/tests/twister/test_runner.py

@@ -467,6 +467,7 @@ def mock_popen(*args, **kwargs):
     cmake.options.overflow_as_errors = False
     cmake.env = mock.Mock()
     cmake.env.generator = 'dummy_generator'
+    cmake.env.options.force_platform_toolchain = []
 
     cmake_path = os.path.join('dummy', 'cmake')