ci: build through job-script recipes; hpc lane is hpc-atos

.ci/build.sh.j2

@@ -0,0 +1,3 @@
+{# SPDX-FileCopyrightText: 1996- European Centre for Medium-Range Weather Forecasts (ECMWF)
+   SPDX-License-Identifier: Apache-2.0 #}
+{% extends "ci-infrastructure/cmake-runner.sh.j2" %}

.ci/hpc/build.sh.j2

@@ -1,6 +1,6 @@
 {# SPDX-FileCopyrightText: 1996- European Centre for Medium-Range Weather Forecasts (ECMWF)
    SPDX-License-Identifier: Apache-2.0 #}
-{% extends "ci-infrastructure/cmake-build.sh.j2" %}
+{% extends "ci-infrastructure/cmake-atos.sh.j2" %}
 {% block preflight %}
 {{ super() }}
 for tool in bison flex; do

.ci/manifest.toml

@@ -28,6 +28,7 @@ ref = "master"
 compiler-inputs = ["cxx-compiler"]
 
 [matrix.build.defaults]
+job-script = "./.ci/build.sh.j2"
 build-type = "RelWithDebInfo"
 runs-on = "arc-runner-very-large"
 ctest-args = '-j "$(nproc)"'
@@ -46,10 +47,6 @@ platform = "ubuntu-24.04"
 
 [matrix.build]
 triggers = ["upstream-change", "rebuild-request"]
-action = "./.github/actions/build-eckit"
-forwarded-inputs = ["c-compiler", "cxx-compiler", "build-type"]
-forwarded-deps-outputs = ["cmake-prefix-path"]
-ctest = true
 
 [matrix.build-hpc.defaults]
 job-script = "./.ci/hpc/build.sh.j2"
@@ -69,7 +66,7 @@ cxx = "g++"
 time = "00:40:00"
 
 [matrix.build-hpc]
-execution = "hpc"
+execution = "hpc-atos"
 container-credentials = true
 triggers = ["upstream-change", "rebuild-request"]
 forwarded-deps-outputs = ["cmake-prefix-path"]

.github/workflows/ci.yml

@@ -97,19 +97,12 @@ jobs:
 
       - name: Build eckit
         id: build
-        uses: ./.github/actions/build-eckit
+        uses: ecmwf/ci-infrastructure/actions/run-job-script@main
         with:
+          job-script: ${{ matrix.job-script }}
+          matrix-leg: ${{ toJSON(matrix) }}
+          package: eckit
           cmake-prefix-path: ${{ steps.deps.outputs.cmake-prefix-path }}
-          c-compiler: ${{ matrix.c-compiler }}
-          cxx-compiler: ${{ matrix.cxx-compiler }}
-          build-type: ${{ matrix.build-type }}
-
-      # Invocation comes from .ci/manifest.toml's [matrix.build], the same place
-      # the generated cross-repo-trigger.yml renders its Test step from. Spelling
-      # it out again here is how the two lanes drift apart.
-      - name: Test
-        if: ${{ matrix._resolved.ctest }}
-        run: ctest --test-dir "${{ steps.build.outputs.build-dir }}" --output-on-failure ${{ matrix._resolved['ctest-args'] }}
 
       - name: Publish eckit
         uses: ecmwf/ci-infrastructure/actions/publish-artifact@main

.github/workflows/cross-repo-trigger-hpc.yml → .github/workflows/cross-repo-trigger-hpc-atos.yml

@@ -71,7 +71,7 @@ on:
         type: string
         default: main
 concurrency:
-  group: cross-repo-trigger-hpc-eckit-${{ github.ref }}
+  group: cross-repo-trigger-hpc-atos-eckit-${{ github.ref }}
   cancel-in-progress: false
 env:
   ARTIFACT_POLL_INTERVAL: ${{ vars.ARTIFACT_POLL_INTERVAL || '60' }}

.github/workflows/cross-repo-trigger.yml

@@ -176,15 +176,9 @@ jobs:
           fi
           printf '%s' "$val"
         }
-        c_compiler=$(require '."c-compiler"' c-compiler)
-        cxx_compiler=$(require '."cxx-compiler"' cxx-compiler)
-        build_type=$(require '."build-type"' build-type)
         deps_json=$(require '._resolved.deps | tojson' '_resolved.deps')
         own_artifact_name=$(require '._resolved."own-artifact-name"' '_resolved.own-artifact-name')
         {
-          echo "c-compiler=${c_compiler}"
-          echo "cxx-compiler=${cxx_compiler}"
-          echo "build-type=${build_type}"
           echo "deps-json=${deps_json}"
           echo "own-artifact-name=${own_artifact_name}"
         } >> "$GITHUB_OUTPUT"
@@ -196,14 +190,12 @@ jobs:
         token: ${{ steps.mint.outputs.token }}
     - name: Build
       id: build
-      uses: ./.github/actions/build-eckit
+      uses: ecmwf/ci-infrastructure/actions/run-job-script@main
       with:
+        job-script: ${{ matrix.job-script }}
+        matrix-leg: ${{ toJSON(matrix) }}
+        package: eckit
         cmake-prefix-path: ${{ steps.deps.outputs.cmake-prefix-path }}
-        c-compiler: ${{ steps.m.outputs.c-compiler }}
-        cxx-compiler: ${{ steps.m.outputs.cxx-compiler }}
-        build-type: ${{ steps.m.outputs.build-type }}
-    - name: Test
-      run: ctest --test-dir "${{ steps.build.outputs.build-dir }}" --output-on-failure ${{ matrix._resolved['ctest-args'] }}
     - name: Publish
       uses: ecmwf/ci-infrastructure/actions/publish-artifact@main
       with:

.github/workflows/trigger-downstream-hpc.yml → .github/workflows/trigger-downstream-hpc-atos.yml

@@ -12,7 +12,7 @@ on:
     types:
     - completed
 concurrency:
-  group: trigger-downstream-hpc-${{ github.event.workflow_run.head_sha }}
+  group: trigger-downstream-hpc-atos-${{ github.event.workflow_run.head_sha }}
   cancel-in-progress: true
 jobs:
   context:
@@ -81,7 +81,7 @@ jobs:
         gh api -X POST \
           "/repos/${{ github.repository }}/statuses/${{ needs.context.outputs.head-sha }}" \
           -f state=pending \
-          -f context='downstream/hpc' \
+          -f context='downstream/hpc-atos' \
           -f target_url="${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
           -f description='Downstream HPC tests running'
     needs:
@@ -100,7 +100,7 @@ jobs:
         gh api -X POST \
           "/repos/${{ github.repository }}/statuses/${{ needs.context.outputs.head-sha }}" \
           -f state=failure \
-          -f context='downstream/hpc' \
+          -f context='downstream/hpc-atos' \
           -f target_url="${{ needs.context.outputs.ci-url }}" \
           -f description="${{ needs.context.outputs.ci-summary }}; downstream HPC not run"
     needs:
@@ -112,7 +112,7 @@ jobs:
     - context
     - label-gate
     - validate
-    uses: ecmwf/eccodes/.github/workflows/cross-repo-trigger-hpc.yml@develop
+    uses: ecmwf/eccodes/.github/workflows/cross-repo-trigger-hpc-atos.yml@develop
     with:
       from-repo: ${{ github.repository }}
       from-sha: ${{ needs.context.outputs.head-sha }}
@@ -148,6 +148,6 @@ jobs:
         gh api -X POST \
           "/repos/${{ github.repository }}/statuses/${{ needs.context.outputs.head-sha }}" \
           -f state="$state" \
-          -f context='downstream/hpc' \
+          -f context='downstream/hpc-atos' \
           -f target_url="${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
           -f description="Downstream HPC tests $state$scope"