clean up

Author: WeiqunZhang

.github/workflows/hpsf-gitlab-ci.yml

@@ -4,6 +4,10 @@ on:
   issue_comment:
     types: [created]
 
+env:
+  GITLAB_PROJECT_PATH: "amrex/amrex"
+  GITLAB_PROJECT_ID: "70"
+
 jobs:
   run-hpsf-gitlab-ci:
     if: |
@@ -15,6 +19,7 @@ jobs:
     steps:
       - name: Determine PR merge ref
         id: setref
+        shell: bash
         run: |
           PR_NUMBER=${{ github.event.issue.number }}
           MERGE_REF="refs/pull/$PR_NUMBER/merge"
@@ -23,15 +28,18 @@ jobs:
 
       - name: Trigger GitLab pipeline
         id: trigger
+        shell: bash
         run: |
           MERGE_REF="${{ steps.setref.outputs.merge_ref }}"
           echo "Triggering GitLab pipeline for ref: $MERGE_REF"
 
           RESPONSE=$(curl -s -X POST \
             -F token=${{ secrets.HPSF_GITLAB_TRIGGER_TOKEN }} \
             -F ref=development \
-            -F "variables[GITHUB_PR_NUMBER]=$PR_NUMBER" \
-            "https://gitlab.spack.io/api/v4/projects/${{ secrets.HPSF_GITLAB_PROJECT_ID }}/trigger/pipeline")
+            -F "variables[GITHUB_PR_NUMBER]=${{ github.event.issue.number }}" \
+            -F "variables[GITHUB_MERGE_REF]=refs/pull/${{ github.event.issue.number }}/merge" \
+            -F "variables[GITHUB_TRIGGER_ACTOR]=${{ github.actor }}" \
+            "https://gitlab.spack.io/api/v4/projects/${{ env.GITLAB_PROJECT_ID }}/trigger/pipeline")
 
           echo "GitLab response: $RESPONSE"
 
@@ -42,12 +50,13 @@ jobs:
             exit 1
           fi
 
+          echo "Pipeline URL: https://gitlab.spack.io/${{ env.GITLAB_PROJECT_PATH }}/-/pipelines/$PIPELINE_ID"
           echo "pipeline_id=$PIPELINE_ID" >> $GITHUB_OUTPUT
 
       - name: Wait for GitLab pipeline to finish
         id: wait
+        shell: bash
         run: |
-          PROJECT_ID=${{ secrets.HPSF_GITLAB_PROJECT_ID }}
           PIPELINE_ID=${{ steps.trigger.outputs.pipeline_id }}
 
           echo "Waiting on GitLab pipeline $PIPELINE_ID..."
@@ -56,20 +65,23 @@ jobs:
           while [[ "$STATUS" == "running" || "$STATUS" == "pending" ]]; do
             sleep 300
             STATUS=$(curl -s \
-              "https://gitlab.spack.io/api/v4/projects/$PROJECT_ID/pipelines/$PIPELINE_ID" \
+              "https://gitlab.spack.io/api/v4/projects/${{ env.GITLAB_PROJECT_ID }}/pipelines/$PIPELINE_ID" \
               | jq -r '.status')
             echo "Status: $STATUS"
           done
 
           echo "final_status=$STATUS" >> $GITHUB_OUTPUT
 
       - name: Post result back to GitHub PR
+        shell: bash
         run: |
           STATUS=${{ steps.wait.outputs.final_status }}
-          COMMENT="GitLab CI finished with status: **$STATUS**"
+          PIPELINE_ID=${{ steps.trigger.outputs.pipeline_id }}
+          PIPELINE_URL="https://gitlab.spack.io/${{ env.GITLAB_PROJECT_PATH }}/-/pipelines/$PIPELINE_ID"
+          COMMENT="GitLab CI finished with status: **$STATUS**. See details at ${PIPELINE_URL}."
 
           gh api \
             repos/${{ github.repository }}/issues/${{ github.event.issue.number }}/comments \
-            -f body="$COMMENT"
+            -f body="$COMMENT" || echo "Failed to post comment to GitHub"
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitlab/hpsf-gitlab-ci.yml

@@ -1,35 +1,22 @@
-stages:
-  - prepare
-  - test
-
-fetch-github-pr:
-  stage: prepare
-  tags: [hpsf]
-  image: ubuntu:24.04
-  variables:
-    GIT_STRATEGY: fetch
-  rules:
-    - if: '$GITHUB_PR_NUMBER' # GITHUB_PR_NUMBER is provided by a GitHub Action
-      when: always
-    - when: never  # For non-github-pr job, the script part will be skipped.
-  script:
-    - apt-get update && apt-get install -y git
-    - echo "GITHUB_PR_NUMBER=$GITHUB_PR_NUMBER"
-    - MERGE_REF="refs/pull/${GITHUB_PR_NUMBER}/merge"
-    - echo "Fetching GitHub PR merge ref $MERGE_REF"
-    - git fetch origin +${MERGE_REF}:refs/remotes/origin/pr-${GITHUB_PR_NUMBER}
-    - git checkout pr-${GITHUB_PR_NUMBER}
+.dependency-n-fetch-pr:
+  stage: test
+  before_script:
+    - apt-get update && apt-get install -y git cmake python3 libopenmpi-dev openmpi-bin
+    - |
+      if [ -n "$GITHUB_PR_NUMBER" ]; then
+        echo "GITHUB_PR_NUMBER=$GITHUB_PR_NUMBER"
+        echo "GITHUB_MERGE_REF=$GITHUB_MERGE_REF"
+        echo "GITHUB_TRIGGER_ACTOR=$GITHUB_TRIGGER_ACTOR"
+        git remote add github https://github.com/amrex-codes/amrex.git
+        git fetch --depth=1 github "${GITHUB_MERGE_REF}"
+        git checkout FETCH_HEAD -b pr-${GITHUB_PR_NUMBER}
+      fi
 
 Nvidia-H100-single-precision:
-  stage: test
+  extends: .dependency-n-fetch-pr
   tags: [nvidia-h100]
   image: nvcr.io/nvidia/cuda:12.8.0-devel-ubuntu24.04
-  rules:
-    - when: always
-  dependencies:
-    - fetch-github-pr
   script:
-    - apt-get update && apt-get install -y cmake git python3 libopenmpi-dev openmpi-bin
     - |
       cmake -S . -B build                              \
           -DCMAKE_VERBOSE_MAKEFILE=ON                  \
@@ -54,15 +41,10 @@ Nvidia-H100-single-precision:
     - ctest -j 2 --test-dir build --output-on-failure
 
 AMD-MI300A:
-  stage: test
+  extends: .dependency-n-fetch-pr
   tags: [amd-mi300]
   image: rocm/dev-ubuntu-24.04:6.4.3-complete
-  rules:
-    - when: always
-  dependencies:
-    - fetch-github-pr
   script:
-    - apt-get update && apt-get install -y cmake git libopenmpi-dev openmpi-bin
     - export ROCM_PATH=/opt/rocm-6.4.3
     - export PATH=$ROCM_PATH/bin:$ROCM_PATH/llvm/bin:$PATH
     - export LD_LIBRARY_PATH=$ROCM_PATH/lib:$ROCM_PATH/lib64:$LD_LIBRARY_PATH
@@ -89,15 +71,10 @@ AMD-MI300A:
     - ctest -j 2 --test-dir build --output-on-failure
 
 #Intel-PVC:
-#  stage: test
+#  extends: .dependency-n-fetch-pr
 #  tags: [intel-data-center-max-1100]
 #  image: intel/oneapi-basekit:2025.3.0-0-devel-ubuntu24.04
-#  rules:
-#    - when: always
-#  dependencies:
-#    - fetch-github-pr
 #  script:
-#    - apt-get update && apt-get install -y git
 #    - sycl-ls
 #    - export ONEAPI_DEVICE_SELECTOR=level_zero:gpu
 #    - |
@@ -116,3 +93,4 @@ AMD-MI300A:
 #    - cmake --build build -j 16
 #    - export AMREX_THE_ARENA_INIT_SIZE=1e9
 #    - ctest -j 4 --test-dir build --output-on-failure
+