diff --git a/.github/workflows/mirror.yaml b/.github/workflows/mirror.yaml index a60b501ab9603446e3ad9582e96407e4fb171e4d..e75d47c3c78ce250b5223028b0c02a1bbe14b45d 100644 --- a/.github/workflows/mirror.yaml +++ b/.github/workflows/mirror.yaml @@ -31,13 +31,14 @@ jobs: ciskip: true - name: Trigger EICweb if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' - uses: eic/trigger-gitlab-ci@v2 + uses: eic/trigger-gitlab-ci@v3 with: url: https://eicweb.phy.anl.gov project_id: 290 token: ${{ secrets.EICWEB_EIC_CONTAINER_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_CONTAINER=${{ github.repository }}: ${{ github.event.pull_request.title || github.ref_name }} diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index daa6d9a2fdbe45d9dbb9f29f921741ab485784d6..c146aa5dea05128696f71ba4e76696decb6b0e34 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -55,6 +55,8 @@ stages: ## nightly builds are now part of the regular master build in order to keep ## all artifacts available at all times. workflow: + # would like to use PIPELINE_NAME but there is a bug https://gitlab.com/gitlab-org/gitlab/-/issues/441777 + name: '$PIPELINE_NAME_CONTAINER' rules: - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - if: '$CI_PIPELINE_SOURCE == "web"' @@ -555,6 +557,7 @@ benchmarks:detector:default: BENCHMARKS_TAG: "${INTERNAL_TAG}-default" BENCHMARKS_CONTAINER: "jug_xl" BENCHMARKS_REGISTRY: "$CI_REGISTRY_IMAGE" + PIPELINE_NAME: "$PIPELINE_NAME_CONTAINER" trigger: project: EIC/benchmarks/detector_benchmarks strategy: depend @@ -574,6 +577,7 @@ benchmarks:detector:nightly: BENCHMARKS_TAG: "${INTERNAL_TAG}-nightly" BENCHMARKS_CONTAINER: "jug_xl" BENCHMARKS_REGISTRY: "$CI_REGISTRY_IMAGE" + PIPELINE_NAME: "$PIPELINE_NAME_CONTAINER" trigger: project: EIC/benchmarks/detector_benchmarks strategy: depend