From badef9305b1ec1b4e62d6d3e924f8e38a69bca49 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 17 May 2024 10:37:21 -0400 Subject: [PATCH] Pass pipeline name downstream, use new format --- .github/workflows/mirror.yaml | 6 +++--- .gitlab-ci.yml | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/mirror.yaml b/.github/workflows/mirror.yaml index eed20c12..2aa42798 100644 --- a/.github/workflows/mirror.yaml +++ b/.github/workflows/mirror.yaml @@ -28,14 +28,14 @@ jobs: username: ${{ secrets.GITLAB_USERNAME }} ciskip: true - name: Trigger EICweb - uses: eic/trigger-gitlab-ci@v2 + uses: eic/trigger-gitlab-ci@v3 with: url: https://eicweb.phy.anl.gov project_id: 399 token: ${{ secrets.EICWEB_DETECTOR_BENCHMARKS_TRIGGER }} ref_name: ${{ github.event.pull_request.head.ref || github.ref }} - variables: + variables: | GITHUB_REPOSITORY=${{ github.repository }} GITHUB_SHA=${{ github.event.pull_request.head.sha || github.sha }} GITHUB_PR=${{ github.event.pull_request.number }} - PIPELINE_NAME=${{ github.event.pull_request.title }} + PIPELINE_NAME=${{ github.repository }}: ${{ github.event.pull_request.title || github.ref_name }} diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0d54172f..392ecd56 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -182,6 +182,7 @@ benchmarks:reconstruction: BENCHMARKS_TAG: "${BENCHMARKS_TAG}" BENCHMARKS_CONTAINER: "${BENCHMARKS_CONTAINER}" BENCHMARKS_REGISTRY: "${BENCHMARKS_REGISTRY}" + PIPELINE_NAME: "$PIPELINE_NAME" trigger: project: EIC/benchmarks/reconstruction_benchmarks strategy: depend @@ -202,6 +203,7 @@ benchmarks:physics: BENCHMARKS_TAG: "${BENCHMARKS_TAG}" BENCHMARKS_CONTAINER: "${BENCHMARKS_CONTAINER}" BENCHMARKS_REGISTRY: "${BENCHMARKS_REGISTRY}" + PIPELINE_NAME: "$PIPELINE_NAME" trigger: project: EIC/benchmarks/physics_benchmarks strategy: depend