ceph-{ansible,installer}-rpm: fix config locations

Our jenkins-job-builder job expects the JJB YAML to be located in a
"config/definitions" directory. Add the child "definitions" directory
here.

diff --git a/ceph-ansible-rpm/config/ceph-ansible-rpm.yml b/ceph-ansible-rpm/config/ceph-ansible-rpm.yml
deleted file mode 100644 (file)
index d0ee8ca..0000000
--- a/ceph-ansible-rpm/config/ceph-ansible-rpm.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-- job:
-    name: ceph-ansible-rpm
-    node: 'centos7 && x86_64 && small'
-    project-type: freestyle
-    defaults: global
-    disabled: false
-    display-name: 'ceph-ansible: RPMs'
-    description: 'Build RPMs for every ceph-ansible Git branch'
-    concurrent: true
-    quiet-period: 5
-    block-downstream: false
-    block-upstream: false
-    retry-count: 3
-    properties:
-      - github:
-          url: https://github.com/ceph/ceph-ansible
-    discard-old-builds: true
-    logrotate:
-      daysToKeep: 1
-      numToKeep: 10
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
-
-    triggers:
-      - github
-
-    scm:
-      - git:
-          url: https://github.com/ceph/ceph-ansible
-          browser: auto
-          skip-tag: true
-          timeout: 20
-          wipe-workspace: true
-
-    builders:
-      - shell:
-          !include-raw:
-            - ../../scripts/build_utils.sh
-            - ../build/build
-
-    wrappers:
-      - inject-passwords:
-          global: true
-          mask-password-params: true

diff --git a/ceph-ansible-rpm/config/definitions/ceph-ansible-rpm.yml b/ceph-ansible-rpm/config/definitions/ceph-ansible-rpm.yml
new file mode 100644 (file)
index 0000000..7fc9c58
--- /dev/null
+++ b/ceph-ansible-rpm/config/definitions/ceph-ansible-rpm.yml
@@ -0,0 +1,44 @@
+- job:
+    name: ceph-ansible-rpm
+    node: 'centos7 && x86_64 && small'
+    project-type: freestyle
+    defaults: global
+    disabled: false
+    display-name: 'ceph-ansible: RPMs'
+    description: 'Build RPMs for every ceph-ansible Git branch'
+    concurrent: true
+    quiet-period: 5
+    block-downstream: false
+    block-upstream: false
+    retry-count: 3
+    properties:
+      - github:
+          url: https://github.com/ceph/ceph-ansible
+    discard-old-builds: true
+    logrotate:
+      daysToKeep: 1
+      numToKeep: 10
+      artifactDaysToKeep: -1
+      artifactNumToKeep: -1
+
+    triggers:
+      - github
+
+    scm:
+      - git:
+          url: https://github.com/ceph/ceph-ansible
+          browser: auto
+          skip-tag: true
+          timeout: 20
+          wipe-workspace: true
+
+    builders:
+      - shell:
+          !include-raw:
+            - ../../../scripts/build_utils.sh
+            - ../../build/build
+
+    wrappers:
+      - inject-passwords:
+          global: true
+          mask-password-params: true

diff --git a/ceph-installer-rpm/config/ceph-installer-rpm.yml b/ceph-installer-rpm/config/ceph-installer-rpm.yml
deleted file mode 100644 (file)
index de7a146..0000000
--- a/ceph-installer-rpm/config/ceph-installer-rpm.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-- job:
-    name: ceph-installer-rpm
-    node: 'centos7 && x86_64 && small'
-    project-type: freestyle
-    defaults: global
-    disabled: false
-    display-name: 'ceph-installer: RPMs'
-    description: 'Build RPMs for every ceph-installer Git branch'
-    concurrent: true
-    quiet-period: 5
-    block-downstream: false
-    block-upstream: false
-    retry-count: 3
-    properties:
-      - github:
-          url: https://github.com/ceph/ceph-installer
-    discard-old-builds: true
-    logrotate:
-      daysToKeep: 1
-      numToKeep: 10
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
-
-    triggers:
-      - github
-
-    scm:
-      - git:
-          url: https://github.com/ceph/ceph-installer
-          browser: auto
-          skip-tag: true
-          timeout: 20
-          wipe-workspace: true
-
-    builders:
-      - shell:
-          !include-raw:
-            - ../../scripts/build_utils.sh
-            - ../build/build
-
-    wrappers:
-      - inject-passwords:
-          global: true
-          mask-password-params: true

diff --git a/ceph-installer-rpm/config/definitions/ceph-installer-rpm.yml b/ceph-installer-rpm/config/definitions/ceph-installer-rpm.yml
new file mode 100644 (file)
index 0000000..3693c57
--- /dev/null
+++ b/ceph-installer-rpm/config/definitions/ceph-installer-rpm.yml
@@ -0,0 +1,44 @@
+- job:
+    name: ceph-installer-rpm
+    node: 'centos7 && x86_64 && small'
+    project-type: freestyle
+    defaults: global
+    disabled: false
+    display-name: 'ceph-installer: RPMs'
+    description: 'Build RPMs for every ceph-installer Git branch'
+    concurrent: true
+    quiet-period: 5
+    block-downstream: false
+    block-upstream: false
+    retry-count: 3
+    properties:
+      - github:
+          url: https://github.com/ceph/ceph-installer
+    discard-old-builds: true
+    logrotate:
+      daysToKeep: 1
+      numToKeep: 10
+      artifactDaysToKeep: -1
+      artifactNumToKeep: -1
+
+    triggers:
+      - github
+
+    scm:
+      - git:
+          url: https://github.com/ceph/ceph-installer
+          browser: auto
+          skip-tag: true
+          timeout: 20
+          wipe-workspace: true
+
+    builders:
+      - shell:
+          !include-raw:
+            - ../../../scripts/build_utils.sh
+            - ../../build/build
+
+    wrappers:
+      - inject-passwords:
+          global: true
+          mask-password-params: true