s/ceph-dev-nightly/ceph-dev-cron

Fixes: https://github.com/ceph/ceph-build/pull/1743#issuecomment-780840190
Signed-off-by: David Galloway <dgallowa@redhat.com>

diff --git a/ceph-dev-cron/build/notify b/ceph-dev-cron/build/notify
new file mode 100644 (file)
index 0000000..cb1ed77
--- /dev/null
+++ b/ceph-dev-cron/build/notify
@@ -0,0 +1,9 @@
+#!/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" "ceph"

diff --git a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml
new file mode 100644 (file)
index 0000000..e3dcb16
--- /dev/null
+++ b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml
@@ -0,0 +1,188 @@
+- job:
+    name: 'ceph-dev-cron'
+    node: master
+    project-type: freestyle
+    defaults: global
+    concurrent: true
+    quiet-period: 5
+    block-downstream: false
+    block-upstream: false
+    properties:
+      - build-discarder:
+          days-to-keep: 1
+          num-to-keep: 10
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
+      - github:
+          url: https://github.com/ceph/ceph
+    discard-old-builds: true
+
+    triggers:
+      - pollscm:
+          cron: |
+            TZ=Etc/UTC
+            H 14 * * *
+            H 20 * * *
+
+    scm:
+      - git:
+          url: https://github.com/ceph/ceph
+          browser: auto
+          branches:
+            - origin/master
+            - origin/pacific
+            - origin/octopus
+            - origin/nautilus
+          skip-tag: true
+          timeout: 20
+          wipe-workspace: true
+
+    builders:
+      # Build luminous on:
+      # default: centos7 bionic xenial trusty
+      # notcmalloc: centos7
+      - conditional-step:
+          condition-kind: regex-match
+          regex: .*luminous.*
+          label: '${GIT_BRANCH}'
+          on-evaluation-failure: dont-run
+          steps:
+            - shell:
+                !include-raw:
+                - ../../../scripts/build_utils.sh
+                - ../../build/notify
+            - trigger-builds:
+                - project: 'ceph-dev'
+                  predefined-parameters: |
+                    BRANCH=${GIT_BRANCH}
+                    FORCE=True
+                    DISTROS=centos7 bionic xenial trusty
+                - project: 'ceph-dev'
+                  predefined-parameters: |
+                    BRANCH=${GIT_BRANCH}
+                    FORCE=True
+                    FLAVOR=notcmalloc
+                    DISTROS=centos7
+      # build nautilus on:
+      # default: bionic xenial centos7 centos8
+      # notcmalloc: centos7
+      - conditional-step:
+          condition-kind: regex-match
+          regex: .*nautilus.*
+          label: '${GIT_BRANCH}'
+          on-evaluation-failure: dont-run
+          steps:
+            - shell:
+                !include-raw:
+                - ../../../scripts/build_utils.sh
+                - ../../build/notify
+            - trigger-builds:
+                - project: 'ceph-dev'
+                  predefined-parameters: |
+                    BRANCH=${GIT_BRANCH}
+                    FORCE=True
+                    DISTROS=bionic xenial centos7 centos8
+                - project: 'ceph-dev'
+                  predefined-parameters: |
+                    BRANCH=${GIT_BRANCH}
+                    FORCE=True
+                    DISTROS=centos7
+                    FLAVOR=notcmalloc
+      # build octopus on:
+      # default: focal bionic centos7 centos8 leap15
+      # notcmalloc: centos8
+      - conditional-step:
+          condition-kind: regex-match
+          regex: .*octopus.*
+          label: '${GIT_BRANCH}'
+          on-evaluation-failure: dont-run
+          steps:
+            - shell:
+                !include-raw:
+                - ../../../scripts/build_utils.sh
+                - ../../build/notify
+            - trigger-builds:
+                - project: 'ceph-dev'
+                  predefined-parameters: |
+                    BRANCH=${GIT_BRANCH}
+                    FORCE=True
+                    DISTROS=focal bionic centos7 centos8 leap15
+                - project: 'ceph-dev'
+                  predefined-parameters: |
+                    BRANCH=${GIT_BRANCH}
+                    FORCE=True
+                    DISTROS=centos8
+                    FLAVOR=notcmalloc
+      # build pacific on:
+      # default: focal bionic centos8 leap15
+      # notcmalloc: centos8
+      # crimson: centos8
+      - conditional-step:
+          condition-kind: regex-match
+          regex: .*pacific.*
+          label: '${GIT_BRANCH}'
+          on-evaluation-failure: dont-run
+          steps:
+            - shell:
+                !include-raw:
+                - ../../../scripts/build_utils.sh
+                - ../../build/notify
+            - trigger-builds:
+                - project: 'ceph-dev'
+                  predefined-parameters: |
+                    BRANCH=${GIT_BRANCH}
+                    FORCE=True
+                    DISTROS=focal bionic centos8 leap15
+                - project: 'ceph-dev'
+                  predefined-parameters: |
+                    BRANCH=${GIT_BRANCH}
+                    FORCE=True
+                    DISTROS=centos8
+                    FLAVOR=notcmalloc
+                - project: 'ceph-dev'
+                  predefined-parameters: |
+                    BRANCH=${GIT_BRANCH}
+                    FORCE=True
+                    DISTROS=centos8
+                    FLAVOR=crimson
+      # build master on:
+      # default: focal bionic centos8 leap15
+      # notcmalloc: centos8
+      # crimson: centos8
+      - conditional-step:
+          condition-kind: regex-match
+          regex: .*master.*
+          label: '${GIT_BRANCH}'
+          on-evaluation-failure: dont-run
+          steps:
+            - shell:
+                !include-raw:
+                - ../../../scripts/build_utils.sh
+                - ../../build/notify
+            - trigger-builds:
+                - project: 'ceph-dev'
+                  predefined-parameters: |
+                    BRANCH=${GIT_BRANCH}
+                    FORCE=True
+                    DISTROS=focal bionic centos8
+                - project: 'ceph-dev'
+                  predefined-parameters: |
+                    BRANCH=${GIT_BRANCH}
+                    FORCE=True
+                    DISTROS=centos8
+                    FLAVOR=notcmalloc
+                - project: 'ceph-dev'
+                  predefined-parameters: |
+                    BRANCH=${GIT_BRANCH}
+                    FORCE=True
+                    DISTROS=centos8
+                    FLAVOR=crimson
+
+    wrappers:
+      - inject-passwords:
+          global: true
+          mask-password-params: true
+      - credentials-binding:
+          - text:
+              credential-id: shaman-api-key
+              variable: SHAMAN_API_KEY

diff --git a/ceph-dev-nightly/build/notify b/ceph-dev-nightly/build/notify
deleted file mode 100644 (file)
index cb1ed77..0000000
--- a/ceph-dev-nightly/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" "ceph"

diff --git a/ceph-dev-nightly/config/definitions/ceph-dev-nightly.yml b/ceph-dev-nightly/config/definitions/ceph-dev-nightly.yml
deleted file mode 100644 (file)
index 78202dd..0000000
--- a/ceph-dev-nightly/config/definitions/ceph-dev-nightly.yml
+++ /dev/null
@@ -1,188 +0,0 @@
-- job:
-    name: 'ceph-dev-nightly'
-    node: master
-    project-type: freestyle
-    defaults: global
-    concurrent: true
-    quiet-period: 5
-    block-downstream: false
-    block-upstream: false
-    properties:
-      - build-discarder:
-          days-to-keep: 1
-          num-to-keep: 10
-          artifact-days-to-keep: -1
-          artifact-num-to-keep: -1
-      - github:
-          url: https://github.com/ceph/ceph
-    discard-old-builds: true
-
-    triggers:
-      - pollscm:
-          cron: |
-            TZ=Etc/UTC
-            H 14 * * *
-            H 20 * * *
-
-    scm:
-      - git:
-          url: https://github.com/ceph/ceph
-          browser: auto
-          branches:
-            - origin/master
-            - origin/pacific
-            - origin/octopus
-            - origin/nautilus
-          skip-tag: true
-          timeout: 20
-          wipe-workspace: true
-
-    builders:
-      # Build luminous on:
-      # default: centos7 bionic xenial trusty
-      # notcmalloc: centos7
-      - conditional-step:
-          condition-kind: regex-match
-          regex: .*luminous.*
-          label: '${GIT_BRANCH}'
-          on-evaluation-failure: dont-run
-          steps:
-            - shell:
-                !include-raw:
-                - ../../../scripts/build_utils.sh
-                - ../../build/notify
-            - trigger-builds:
-                - project: 'ceph-dev'
-                  predefined-parameters: |
-                    BRANCH=${GIT_BRANCH}
-                    FORCE=True
-                    DISTROS=centos7 bionic xenial trusty
-                - project: 'ceph-dev'
-                  predefined-parameters: |
-                    BRANCH=${GIT_BRANCH}
-                    FORCE=True
-                    FLAVOR=notcmalloc
-                    DISTROS=centos7
-      # build nautilus on:
-      # default: bionic xenial centos7 centos8
-      # notcmalloc: centos7
-      - conditional-step:
-          condition-kind: regex-match
-          regex: .*nautilus.*
-          label: '${GIT_BRANCH}'
-          on-evaluation-failure: dont-run
-          steps:
-            - shell:
-                !include-raw:
-                - ../../../scripts/build_utils.sh
-                - ../../build/notify
-            - trigger-builds:
-                - project: 'ceph-dev'
-                  predefined-parameters: |
-                    BRANCH=${GIT_BRANCH}
-                    FORCE=True
-                    DISTROS=bionic xenial centos7 centos8
-                - project: 'ceph-dev'
-                  predefined-parameters: |
-                    BRANCH=${GIT_BRANCH}
-                    FORCE=True
-                    DISTROS=centos7
-                    FLAVOR=notcmalloc
-      # build octopus on:
-      # default: focal bionic centos7 centos8 leap15
-      # notcmalloc: centos8
-      - conditional-step:
-          condition-kind: regex-match
-          regex: .*octopus.*
-          label: '${GIT_BRANCH}'
-          on-evaluation-failure: dont-run
-          steps:
-            - shell:
-                !include-raw:
-                - ../../../scripts/build_utils.sh
-                - ../../build/notify
-            - trigger-builds:
-                - project: 'ceph-dev'
-                  predefined-parameters: |
-                    BRANCH=${GIT_BRANCH}
-                    FORCE=True
-                    DISTROS=focal bionic centos7 centos8 leap15
-                - project: 'ceph-dev'
-                  predefined-parameters: |
-                    BRANCH=${GIT_BRANCH}
-                    FORCE=True
-                    DISTROS=centos8
-                    FLAVOR=notcmalloc
-      # build pacific on:
-      # default: focal bionic centos8 leap15
-      # notcmalloc: centos8
-      # crimson: centos8
-      - conditional-step:
-          condition-kind: regex-match
-          regex: .*pacific.*
-          label: '${GIT_BRANCH}'
-          on-evaluation-failure: dont-run
-          steps:
-            - shell:
-                !include-raw:
-                - ../../../scripts/build_utils.sh
-                - ../../build/notify
-            - trigger-builds:
-                - project: 'ceph-dev'
-                  predefined-parameters: |
-                    BRANCH=${GIT_BRANCH}
-                    FORCE=True
-                    DISTROS=focal bionic centos8 leap15
-                - project: 'ceph-dev'
-                  predefined-parameters: |
-                    BRANCH=${GIT_BRANCH}
-                    FORCE=True
-                    DISTROS=centos8
-                    FLAVOR=notcmalloc
-                - project: 'ceph-dev'
-                  predefined-parameters: |
-                    BRANCH=${GIT_BRANCH}
-                    FORCE=True
-                    DISTROS=centos8
-                    FLAVOR=crimson
-      # build master on:
-      # default: focal bionic centos8 leap15
-      # notcmalloc: centos8
-      # crimson: centos8
-      - conditional-step:
-          condition-kind: regex-match
-          regex: .*master.*
-          label: '${GIT_BRANCH}'
-          on-evaluation-failure: dont-run
-          steps:
-            - shell:
-                !include-raw:
-                - ../../../scripts/build_utils.sh
-                - ../../build/notify
-            - trigger-builds:
-                - project: 'ceph-dev'
-                  predefined-parameters: |
-                    BRANCH=${GIT_BRANCH}
-                    FORCE=True
-                    DISTROS=focal bionic centos8
-                - project: 'ceph-dev'
-                  predefined-parameters: |
-                    BRANCH=${GIT_BRANCH}
-                    FORCE=True
-                    DISTROS=centos8
-                    FLAVOR=notcmalloc
-                - project: 'ceph-dev'
-                  predefined-parameters: |
-                    BRANCH=${GIT_BRANCH}
-                    FORCE=True
-                    DISTROS=centos8
-                    FLAVOR=crimson
-
-    wrappers:
-      - inject-passwords:
-          global: true
-          mask-password-params: true
-      - credentials-binding:
-          - text:
-              credential-id: shaman-api-key
-              variable: SHAMAN_API_KEY