nfs-ganesha: remove nfs-ganesha-trigger job, try polling instead

Signed-off-by: Ali Maredia <amaredia@redhat.com>

diff --git a/ceph-dev/config/definitions/ceph-dev.yml b/ceph-dev/config/definitions/ceph-dev.yml
index c01125189dbaab4baa4e9e34490f9f1346641863..385fc6b3dd2fe0df6f342e309a68ab55acd7e7b1 100644 (file)
--- a/ceph-dev/config/definitions/ceph-dev.yml
+++ b/ceph-dev/config/definitions/ceph-dev.yml
@@ -74,15 +74,6 @@ If this is checked, then the binaries will be built and pushed to chacra even if
             - name: ceph-dev-build
               current-parameters: true
               exposed-scm: false
-      - multijob:
-          name: 'nfs-ganesha build phase'
-          condition: SUCCESSFUL
-          projects:
-            - name: nfs-ganesha
-              current-parameters: false
-              predefined-parameters: |
-                CEPH_BRANCH=${BRANCH}
-              exposed-scm: false
 
     wrappers:
       - inject-passwords:

diff --git a/nfs-ganesha-trigger/build/notify b/nfs-ganesha-trigger/build/notify
deleted file mode 100644 (file)
index 66caf39..0000000
--- a/nfs-ganesha-trigger/build/notify
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash -ex
-
-# update shaman with the triggered build status. At this point there aren't any
-# architectures or distro information, so we just report this with the current
-# build information
-BRANCH=`branch_slash_filter ${GIT_BRANCH}`
-SHA1=${GIT_COMMIT}
-
-create_build_status "queued" "nfs-ganesha"

diff --git a/nfs-ganesha-trigger/config/definitions/nfs-ganesha-trigger.yml b/nfs-ganesha-trigger/config/definitions/nfs-ganesha-trigger.yml
deleted file mode 100644 (file)
index 21e0cf4..0000000
--- a/nfs-ganesha-trigger/config/definitions/nfs-ganesha-trigger.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-- job:
-    name: nfs-ganesha-trigger
-    node: master
-    project-type: freestyle
-    defaults: global
-    quiet-period: 5
-    block-downstream: false
-    block-upstream: false
-    properties:
-      - github:
-          url: https://github.com/nfs-ganesha/nfs-ganesha
-    discard-old-builds: true
-    logrotate:
-      daysToKeep: 1
-      numToKeep: 10
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
-
-    triggers:
-      - github
-
-    scm:
-      - git:
-          url: https://github.com/nfs-ganesha/nfs-ganesha
-          browser: auto
-          # The default is to build and publish every branch.
-          # Uncomment this for testing:
-          branches:
-            - 'origin/next'
-          skip-tag: true
-          timeout: 20
-          wipe-workspace: true
-
-    builders:
-      - shell:
-          !include-raw:
-            - ../../../scripts/build_utils.sh
-            - ../../build/notify
-      - trigger-builds:
-        - project: 'nfs-ganesha'
-          predefined-parameters: |
-            CEPH_BRANCH=master
-
-    wrappers:
-      - inject-passwords:
-          global: true
-          mask-password-params: true

diff --git a/nfs-ganesha/config/definitions/nfs-ganesha.yml b/nfs-ganesha/config/definitions/nfs-ganesha.yml
index 9aba05c519731ca8350bf96444df0be579a3f95b..de8c3ac892c281cc67a716584e30260afc435984 100644 (file)
--- a/nfs-ganesha/config/definitions/nfs-ganesha.yml
+++ b/nfs-ganesha/config/definitions/nfs-ganesha.yml
@@ -30,6 +30,9 @@
     display-name: 'nfs-ganesha'
     block-downstream: false
     block-upstream: false
+    properties:
+      - github:
+          url: https://github.com/nfs-ganesha/nfs-ganesha
     concurrent: true
     parameters:
       - string:
@@ -105,6 +108,22 @@ If this is checked, then the binaries will be built and pushed to chacra even if
           name: ARCH
           values:
             - ARCHS
+    triggers:
+      - github
+      - pollurl:
+          urls:
+            - url: https://shaman.ceph.com/api/repos/ceph/master/latest/centos/7/repo
+              check-content:
+                - simple: true
+            - url: https://shaman.ceph.com/api/repos/ceph/kraken/latest/centos/7/repo
+              check-content:
+                - simple: true
+            - url: https://shaman/ceph.com/api/repos/ceph/master/latest/ubuntu/xenial/repo
+              check-content:
+                - simple: true
+            - url: https://shaman/ceph.com/api/repos/ceph/kraken/latest/ubuntu/xenial/repo
+              check-content:
+                - simple: true
 
     scm:
       - nfs-ganesha