From bd35570c3ba376c5681f280a5aa52b03ce02ddbd Mon Sep 17 00:00:00 2001
From: David Galloway <dgallowa@redhat.com>
Date: Mon, 29 Jun 2020 18:31:25 -0400
Subject: [PATCH] ceph-pull-requests: Only run during new PR pipeline

Signed-off-by: David Galloway <dgallowa@redhat.com>
---
 ceph-pull-requests/build/build                |  2 +
 ceph-pull-requests/build/failure              |  2 +
 .../config/definitions/ceph-pull-requests.yml | 37 ++++++++++---------
 3 files changed, 24 insertions(+), 17 deletions(-)
 create mode 100644 ceph-pull-requests/build/failure

diff --git a/ceph-pull-requests/build/build b/ceph-pull-requests/build/build
index 1ea1390c..92c80663 100644
--- a/ceph-pull-requests/build/build
+++ b/ceph-pull-requests/build/build
@@ -1,6 +1,8 @@
 #!/bin/bash -ex
+update_github_status "ceph" "pending" "make check" "Running"
 export NPROC=$(nproc)
 export WITH_SEASTAR=true
 timeout 3h ./run-make-check.sh
+update_github_status "ceph" "success" "make check"
 sleep 5
 ps -ef | grep -v jnlp | grep ceph || true
diff --git a/ceph-pull-requests/build/failure b/ceph-pull-requests/build/failure
new file mode 100644
index 00000000..bbf46b16
--- /dev/null
+++ b/ceph-pull-requests/build/failure
@@ -0,0 +1,2 @@
+#!/bin/bash
+update_github_status "ceph" "failure" "make check"
diff --git a/ceph-pull-requests/config/definitions/ceph-pull-requests.yml b/ceph-pull-requests/config/definitions/ceph-pull-requests.yml
index ce96a550..00a88eee 100644
--- a/ceph-pull-requests/config/definitions/ceph-pull-requests.yml
+++ b/ceph-pull-requests/config/definitions/ceph-pull-requests.yml
@@ -1,6 +1,5 @@
 - job:
     name: ceph-pull-requests
-    project-type: freestyle
     defaults: global
     concurrent: true
     # We want make check to only run on Bionic b/c it has python2 and python3 and b/c all builds should build on Bionic
@@ -26,22 +25,6 @@
           name: ghprbPullId
           description: "the GitHub pull id, like '72' in 'ceph/pull/72'"
 
-    triggers:
-      - github-pull-request:
-          allow-whitelist-orgs-as-admins: true
-          org-list:
-            - ceph
-          trigger-phrase: 'jenkins test make check'
-          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"
-          started-status: "running make check"
-          success-status: "make check succeeded"
-          failure-status: "make check failed"
-
     scm:
       - git:
           url: https://github.com/ceph/ceph.git
@@ -62,6 +45,22 @@
           - ../../build/build
 
     publishers:
+      - archive:
+          artifacts: 'build/**'
+          allow-empty: false
+          latest-only: false
+      - postbuildscript:
+          builders:
+            - role: SLAVE
+              build-on:
+                  - FAILURE
+                  - ABORTED
+              build-steps:
+                - shell:
+                    !include-raw:
+                      - ../../../scripts/build_utils.sh
+                      - ../../build/failure
+
       - cobertura:
           report-file: "src/pybind/mgr/dashboard/frontend/coverage/cobertura-coverage.xml"
           only-stable: "true"
@@ -81,3 +80,7 @@
 
     wrappers:
       - ansicolor
+      - credentials-binding:
+          - text:
+              credential-id: 8dff73ff-506c-4397-969d-023f15aedea9
+              variable: GITHUB_API_TOKEN
-- 
2.39.5