From: Alfredo Deza <adeza@redhat.com>
Date: Thu, 1 Dec 2016 14:58:08 +0000 (-0500)
Subject: ceph-dev-new-setup: update the config name to normalized convention
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=674f5c03a43893e21370c100a4ad2aa2ce503793;p=ceph-build.git

ceph-dev-new-setup: update the config name to normalized convention

Signed-off-by: Alfredo Deza <adeza@redhat.com>
---

diff --git a/ceph-dev-new-setup/config/definitions/ceph-dev-new-setup.yml b/ceph-dev-new-setup/config/definitions/ceph-dev-new-setup.yml
new file mode 100644
index 00000000..99929af0
--- /dev/null
+++ b/ceph-dev-new-setup/config/definitions/ceph-dev-new-setup.yml
@@ -0,0 +1,59 @@
+- job:
+    name: ceph-dev-new-setup
+    description: "This job step checks out the branch and builds the tarballs, diffs, and dsc that are passed to the ceph-dev-build step.\r\n\r\nNotes:\r\nJob needs to run on a releatively recent debian system.  The Restrict where run feature is used to specifiy an appropriate label.\r\nThe clear workspace before checkout box for the git plugin is used."
+    # we do not need to pin this to trusty anymore for the new jenkins instance
+    # FIXME: unpin when this gets ported over
+    node: huge && trusty && x86_64
+    display-name: 'ceph-dev-new-setup'
+    logrotate:
+      daysToKeep: -1
+      numToKeep: 25
+      artifactDaysToKeep: -1
+      artifactNumToKeep: -1
+    block-downstream: false
+    block-upstream: false
+    concurrent: true
+    properties:
+      - github:
+          url: https://github.com/ceph/ceph-ci
+
+    parameters:
+      - string:
+          name: BRANCH
+          description: "The git branch (or tag) to build"
+
+    scm:
+      - git:
+          url: git@github.com:ceph/ceph-ci.git
+          # Use the SSH key attached to the ceph-jenkins GitHub account.
+          credentials-id: '39fa150b-b2a1-416e-b334-29a9a2c0b32d'
+          branches:
+            - $BRANCH
+          skip-tag: true
+          wipe-workspace: true
+
+    builders:
+      - shell:
+          !include-raw:
+            - ../../../scripts/build_utils.sh
+            - ../../build/build
+
+    publishers:
+      - archive:
+          artifacts: 'dist/**'
+          allow-empty: false
+          latest-only: false
+
+      - postbuildscript:
+          script-only-if-failed: True
+          script-only-if-succeeded: False
+          builders:
+            - shell:
+                !include-raw:
+                  - ../../../scripts/build_utils.sh
+                  - ../../build/failure
+
+    wrappers:
+      - inject-passwords:
+          global: true
+          mask-password-params: true
diff --git a/ceph-dev-new-setup/config/definitions/ceph-dev-setup-new.yml b/ceph-dev-new-setup/config/definitions/ceph-dev-setup-new.yml
deleted file mode 100644
index 99929af0..00000000
--- a/ceph-dev-new-setup/config/definitions/ceph-dev-setup-new.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-- job:
-    name: ceph-dev-new-setup
-    description: "This job step checks out the branch and builds the tarballs, diffs, and dsc that are passed to the ceph-dev-build step.\r\n\r\nNotes:\r\nJob needs to run on a releatively recent debian system.  The Restrict where run feature is used to specifiy an appropriate label.\r\nThe clear workspace before checkout box for the git plugin is used."
-    # we do not need to pin this to trusty anymore for the new jenkins instance
-    # FIXME: unpin when this gets ported over
-    node: huge && trusty && x86_64
-    display-name: 'ceph-dev-new-setup'
-    logrotate:
-      daysToKeep: -1
-      numToKeep: 25
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
-    block-downstream: false
-    block-upstream: false
-    concurrent: true
-    properties:
-      - github:
-          url: https://github.com/ceph/ceph-ci
-
-    parameters:
-      - string:
-          name: BRANCH
-          description: "The git branch (or tag) to build"
-
-    scm:
-      - git:
-          url: git@github.com:ceph/ceph-ci.git
-          # Use the SSH key attached to the ceph-jenkins GitHub account.
-          credentials-id: '39fa150b-b2a1-416e-b334-29a9a2c0b32d'
-          branches:
-            - $BRANCH
-          skip-tag: true
-          wipe-workspace: true
-
-    builders:
-      - shell:
-          !include-raw:
-            - ../../../scripts/build_utils.sh
-            - ../../build/build
-
-    publishers:
-      - archive:
-          artifacts: 'dist/**'
-          allow-empty: false
-          latest-only: false
-
-      - postbuildscript:
-          script-only-if-failed: True
-          script-only-if-succeeded: False
-          builders:
-            - shell:
-                !include-raw:
-                  - ../../../scripts/build_utils.sh
-                  - ../../build/failure
-
-    wrappers:
-      - inject-passwords:
-          global: true
-          mask-password-params: true