clean 2

Signed-off-by: Anas Nashif <[email protected]>

Author: nashif

.github/workflows/twister-publish.yaml

@@ -5,6 +5,7 @@ on:
     workflows: ["Run tests with twister"]
     branches:
     - main
+    - topic/ci/upload_results
     - v*
     types:
     - completed
@@ -15,8 +16,6 @@ jobs:
     env:
       ELASTICSEARCH_KEY: ${{ secrets.ELASTICSEARCH_KEY }}
       ELASTICSEARCH_SERVER: "https://elasticsearch.zephyrproject.io:443"
-    needs:
-      - twister-build
     runs-on: ubuntu-22.04
     # the build-and-test job might be skipped, we don't need to run this job then
     if: success() || failure()
@@ -40,12 +39,13 @@ jobs:
         run: |
           pip3 install elasticsearch
           # set run date on upload to get consistent and unified data across the matrix.
+          run_date=`date --iso-8601=minutes`
           if [ "${{github.event_name}}" = "push" ]; then
-            python3 ./scripts/ci/upload_test_results_es.py -r ${{needs.twister-build.outputs.rundate}} \
+            python3 ./scripts/ci/upload_test_results_es.py -r ${run_date} \
               --run-attempt ${{github.run_attempt}} \
               --index zephyr-main-ci-push-1 artifacts/*/*/twister.json
           elif [ "${{github.event_name}}" = "schedule" ]; then
-            python3 ./scripts/ci/upload_test_results_es.py -r ${{needs.twister-build.outputs.rundate}} \
+            python3 ./scripts/ci/upload_test_results_es.py -r ${run_date} \
               --run-attempt ${{github.run_attempt}} \
               --index zephyr-main-ci-weekly-1 artifacts/*/*/twister.json
           fi
@@ -71,12 +71,3 @@ jobs:
           check_name: Unit Test Results
           files: "**/twister.xml"
           comment_mode: off
-  twister-status-check:
-    if: always()
-    name: "Check Twister Status"
-    needs:
-      - twister-build-prep
-      - twister-build
-    uses: ./.github/workflows/ready-to-merge.yml
-    with:
-      needs_context: ${{ toJson(needs) }}

.github/workflows/twister.yaml

@@ -31,7 +31,7 @@ jobs:
       rundate: ${{ steps.output-services.outputs.rundate }}
     env:
       MATRIX_SIZE: 10
-      PUSH_MATRIX_SIZE: 5 
+      PUSH_MATRIX_SIZE: 1
       DAILY_MATRIX_SIZE: 80
       BSIM_OUT_PATH: /opt/bsim/
       BSIM_COMPONENTS_PATH: /opt/bsim/components
@@ -234,10 +234,11 @@ jobs:
         name: Run Tests with Twister (Push)
         id: run_twister
         run: |
+
           export ZEPHYR_BASE=${PWD}
           export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
           ./scripts/twister -T tests/kernel/threads -p qemu_x86 --subset ${{matrix.subset}}/${{ strategy.job-total }} ${TWISTER_COMMON} ${PUSH_OPTIONS}
-          if [ "${{matrix.subset}}" = "1" ]; then
+          if [ "${{matrix.subset}}" = "11" ]; 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} ${PUSH_OPTIONS}
@@ -311,67 +312,6 @@ jobs:
           path: |
             frozen-requirements.txt
 
-  twister-test-results:
-    name: "Publish Unit Tests Results"
-    env:
-      ELASTICSEARCH_KEY: ${{ secrets.ELASTICSEARCH_KEY }}
-      ELASTICSEARCH_SERVER: "https://elasticsearch.zephyrproject.io:443"
-    needs:
-      - twister-build
-    runs-on: ubuntu-22.04
-    # the build-and-test job might be skipped, we don't need to run this job then
-    if: success() || failure()
-
-    steps:
-      # Needed for elasticearch and upload script
-      - if: github.event_name == 'push' || github.event_name == 'schedule'
-        name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          persist-credentials: false
-
-      - name: Download Artifacts
-        uses: actions/download-artifact@v4
-        with:
-          path: artifacts
-
-      - if: github.event_name == 'push' || github.event_name == 'schedule'
-        name: Upload to elasticsearch
-        run: |
-          pip3 install elasticsearch
-          # set run date on upload to get consistent and unified data across the matrix.
-          if [ "${{github.event_name}}" = "push" ]; then
-            python3 ./scripts/ci/upload_test_results_es.py -r ${{needs.twister-build.outputs.rundate}} \
-              --run-attempt ${{github.run_attempt}} \
-              --index zephyr-main-ci-push-1 artifacts/*/*/twister.json
-          elif [ "${{github.event_name}}" = "schedule" ]; then
-            python3 ./scripts/ci/upload_test_results_es.py -r ${{needs.twister-build.outputs.rundate}} \
-              --run-attempt ${{github.run_attempt}} \
-              --index zephyr-main-ci-weekly-1 artifacts/*/*/twister.json
-          fi
-
-      - name: Merge Test Results
-        run: |
-          pip3 install junitparser junit2html
-          junitparser merge artifacts/*/*/twister.xml junit.xml
-          junit2html junit.xml junit.html
-
-      - name: Upload Unit Test Results in HTML
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: HTML Unit Test Results
-          if-no-files-found: ignore
-          path: |
-            junit.html
-
-      - name: Publish Unit Test Results
-        uses: EnricoMi/publish-unit-test-result-action@v2
-        with:
-          check_name: Unit Test Results
-          files: "**/twister.xml"
-          comment_mode: off
   twister-status-check:
     if: always()
     name: "Check Twister Status"