ceph-pull-requests-arm64: Remove ghprb

Merge with https://github.com/ceph/ceph/pull/63168

Signed-off-by: David Galloway <david.galloway@ibm.com>

diff --git a/ceph-pull-requests-arm64/build/build b/ceph-pull-requests-arm64/build/build
index 8b4c1372a9199193b2c07309348a7f1ca20e58df..84f1fb10b572b21235f6dd6901c0331c8ba65c29 100644 (file)
--- a/ceph-pull-requests-arm64/build/build
+++ b/ceph-pull-requests-arm64/build/build
@@ -1,11 +1,8 @@
 #!/bin/bash -ex
 
-docs_pr_only
-container_pr_only
-if [[ "$DOCS_ONLY" = true || "$CONTAINER_ONLY" = true ]]; then
-    echo "Only the doc/ or container/ dir changed.  No need to run make check."
-    exit 0
-fi
+echo "This job was triggered by $TRIGGER_METHOD via $TRIGGERED_BY"
+
+report_github_check_status pending "make check (arm64)" "make check (arm64) running" $GH_PULL_REQUEST_SHA $BUILD_URL
 
 n_build_jobs=$(get_nr_build_jobs)
 n_test_jobs=${n_build_jobs}
@@ -14,5 +11,8 @@ export BUILD_MAKEOPTS="-j${n_build_jobs}"
 export WITH_CRIMSON=true
 export WITH_RBD_RWL=true
 timeout 4h ./run-make-check.sh
+
+report_github_check_status success "make check (arm64)" "make check (arm64) passed" $GH_PULL_REQUEST_SHA $BUILD_URL
+
 sleep 5
 ps -ef | grep -v jnlp | grep ceph || true

diff --git a/ceph-pull-requests-arm64/build/kill-tests b/ceph-pull-requests-arm64/build/kill-tests
index 32271a7f72e8fc3fedc3c165a9fcb7951dbd4a02..7b5436516eff0e71d96638e9470b6a5f37acac35 100644 (file)
--- a/ceph-pull-requests-arm64/build/kill-tests
+++ b/ceph-pull-requests-arm64/build/kill-tests
@@ -1,5 +1,7 @@
 #!/bin/bash -ex
 
+report_github_check_status failure "make check (arm64)" "make check (arm64) failed" $GH_PULL_REQUEST_SHA $BUILD_URL
+
 # kill all descendant processes of ctest
 
 # ceph-pull-requests-arm64/build/build is killed by jenkins when the ceph-pull-requests-arm64 job is aborted or

diff --git a/ceph-pull-requests-arm64/config/definitions/ceph-pull-requests-arm64.yml b/ceph-pull-requests-arm64/config/definitions/ceph-pull-requests-arm64.yml
index 624fa8c20b91fdc73aa80df33ac4a19a3b261398..735a510f6242d67decd70c3c6e1066893f7ca250 100644 (file)
--- a/ceph-pull-requests-arm64/config/definitions/ceph-pull-requests-arm64.yml
+++ b/ceph-pull-requests-arm64/config/definitions/ceph-pull-requests-arm64.yml
@@ -5,16 +5,27 @@
     - shell:
         !include-raw-verbatim:
           - ../../../scripts/build_utils.sh
+          - ../../../scripts/report_github_check_status.sh
           - ../../build/build
     concurrent: true
     disabled: false
     name: ceph-pull-requests-arm64
     node: 'arm64 && !centos7 && !centos8 && !centos9'
+
     parameters:
-    - string:
-        name: ghprbPullId
-        description: "the GitHub pull id, like '72' in 'ceph/pull/72'"
-        default: origin/main
+      - string:
+          name: GH_PULL_REQUEST_ID
+          description: "The GitHub PR number, like '72' in 'ceph/pull/72'"
+      - string:
+          name: GH_PULL_REQUEST_SHA
+          description: "The GitHub PR SHA1, like 'c816207c3130c67e5bcc56766a530e881e2c0181'"
+      - string:
+          name: TRIGGERED_BY
+          description: "The GitHub Action Workflow that called this job"
+      - string:
+          name: TRIGGER_METHOD
+          description: "The method by which this job was triggered (e.g., comment or push)"
+
     project-type: freestyle
     properties:
     - build-discarder:
@@ -42,31 +53,13 @@
         url: https://github.com/ceph/ceph.git
         name: origin
         branches:
-          - origin/pr/${{ghprbPullId}}/merge
-        refspec: +refs/pull/${{ghprbPullId}}/*:refs/remotes/origin/pr/${{ghprbPullId}}/*
+          - origin/pr/${{GH_PULL_REQUEST_ID}}/merge
+        refspec: +refs/pull/${{GH_PULL_REQUEST_ID}}/*:refs/remotes/origin/pr/${{GH_PULL_REQUEST_ID}}/*
         skip-tag: true
         shallow-clone: true
         honor-refspec: true
         timeout: 20
         wipe-workspace: true
-    triggers:
-    - github-pull-request:
-        cancel-builds-on-update: true
-        allow-whitelist-orgs-as-admins: true
-        org-list:
-        - ceph
-        trigger-phrase: 'jenkins test make check arm64'
-        skip-build-phrase: '^jenkins do not test.*'
-        only-trigger-phrase: false
-        github-hooks: true
-        permit-all: true
-        auto-close-on-fail: false
-        status-context: "make check (arm64)"
-        started-status: "running make check"
-        success-status: "make check succeeded"
-        failure-status: "make check failed"
-        white-list-target-branches:
-        - main
     publishers:
       - cobertura:
           report-file: "src/pybind/mgr/dashboard/frontend/coverage/cobertura-coverage.xml"
@@ -110,3 +103,6 @@
               credential-id: github-readonly-token
               username: GITHUB_USER
               password: GITHUB_PASS
+          - text:
+              credential-id: github-ceph-jenkins-pr-checks
+              variable: GITHUB_TOKEN