xxx

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

Author: nashif

.github/workflows/twister.yaml

@@ -24,16 +24,14 @@ jobs:
   twister-build-prep:
     if: github.repository_owner == 'zephyrproject-rtos'
     runs-on: ubuntu-22.04
-    container:
-      image: ghcr.io/zephyrproject-rtos/ci-repo-cache:v0.27.4.20241026
-      options: '--entrypoint /bin/bash'
     outputs:
       subset: ${{ steps.output-services.outputs.subset }}
       size: ${{ steps.output-services.outputs.size }}
       fullrun: ${{ steps.output-services.outputs.fullrun }}
+      rundate: ${{ steps.output-services.outputs.rundate }}
     env:
       MATRIX_SIZE: 10
-      PUSH_MATRIX_SIZE: 20
+      PUSH_MATRIX_SIZE: 5 
       DAILY_MATRIX_SIZE: 80
       BSIM_OUT_PATH: /opt/bsim/
       BSIM_COMPONENTS_PATH: /opt/bsim/components
@@ -101,21 +99,6 @@ jobs:
           fi
           rm -f testplan.json .testplan
 
-      - name: Provide rundate to runners
-        id: test-plan-rundate
-        run: |
-          run_date=`date --iso-8601=minutes`
-          echo "RUNDATE=${run_date}" > testplan.txt
-
-      - name: Upload Testplans
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: Testplans
-          if-no-files-found: ignore
-          path: |
-            testplan.txt
-
       - name: Determine matrix size
         id: output-services
         run: |
@@ -135,6 +118,8 @@ jobs:
           else
             size=0
           fi
+          run_date=`date --iso-8601=minutes`
+          echo "rundate=${run_date}" >> $GITHUB_OUTPUT
           echo "subset=${subset}" >> $GITHUB_OUTPUT
           echo "size=${size}" >> $GITHUB_OUTPUT
           echo "fullrun=${TWISTER_FULL}" >> $GITHUB_OUTPUT
@@ -152,6 +137,8 @@ jobs:
       matrix:
         subset: ${{fromJSON(needs.twister-build-prep.outputs.subset)}}
     timeout-minutes: 1440
+    outputs:
+      rundate: ${{ steps.run_twister.outputs.rundate }}
     env:
       CCACHE_DIR: /node-cache/ccache-zephyr
       CCACHE_REMOTE_STORAGE: "redis://cache-*.keydb-cache.svc.cluster.local|shards=1,2,3"
@@ -245,6 +232,7 @@ jobs:
 
       - if: github.event_name == 'push'
         name: Run Tests with Twister (Push)
+        id: run_twister
         run: |
           export ZEPHYR_BASE=${PWD}
           export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
@@ -255,9 +243,11 @@ jobs:
               ./scripts/twister +module_tests.args --outdir module_tests ${TWISTER_COMMON} ${PUSH_OPTIONS}
             fi
           fi
+          echo "rundate=${{needs.twister-build-prep.outputs.rundate}}" >> $GITHUB_OUTPUT
 
       - if: github.event_name == 'pull_request_target'
         name: Run Tests with Twister (Pull Request)
+        id: run_twister
         run: |
           rm -f testplan.json
           export ZEPHYR_BASE=${PWD}
@@ -273,6 +263,7 @@ jobs:
 
       - if: github.event_name == 'schedule'
         name: Run Tests with Twister (Daily)
+        id: run_twister
         run: |
           export ZEPHYR_BASE=${PWD}
           export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
@@ -283,6 +274,7 @@ jobs:
               ./scripts/twister +module_tests.args --outdir module_tests ${TWISTER_COMMON} ${DAILY_OPTIONS}
             fi
           fi
+          echo "rundate=${{needs.twister-build-prep.outputs.rundate}}" >> $GITHUB_OUTPUT
 
       - name: Print ccache stats
         if: always()
@@ -325,7 +317,6 @@ jobs:
       ELASTICSEARCH_KEY: ${{ secrets.ELASTICSEARCH_KEY }}
       ELASTICSEARCH_SERVER: "https://elasticsearch.zephyrproject.io:443"
     needs:
-      - twister-build-prep
       - twister-build
     runs-on: ubuntu-22.04
     # the build-and-test job might be skipped, we don't need to run this job then
@@ -350,12 +341,11 @@ 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 ${run_date} \
+            python3 ./scripts/ci/upload_test_results_es.py -r ${{needs.twister-build.outputs.rundate}} \
               --index zephyr-main-ci-push-1 artifacts/*/*/twister.json
           elif [ "${{github.event_name}}" = "schedule" ]; then
-            python3 ./scripts/ci/upload_test_results_es.py -r ${run_date} \
+            python3 ./scripts/ci/upload_test_results_es.py -r ${{needs.twister-build-prep.outputs.rundate}} \
               --index zephyr-main-ci-weekly-1 artifacts/*/*/twister.json
           fi