From: Andrew Schoen <aschoen@redhat.com>
Date: Fri, 6 Jan 2017 17:05:52 +0000 (-0600)
Subject: ceph-installer-tests: a project to run ceph-installer functional tests
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F612%2Fhead;p=ceph-build.git

ceph-installer-tests: a project to run ceph-installer functional tests

This will create a new jenkins job for each testing scenario defined in
the config file. These jobs will run daily and can be trigger manually,
optionally providing which branches of ceph-installer and ceph-ansible
to test with.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
---

diff --git a/ceph-installer-nightly/build/build b/ceph-installer-nightly/build/build
deleted file mode 100644
index f572889b..00000000
--- a/ceph-installer-nightly/build/build
+++ /dev/null
@@ -1,9 +0,0 @@
-# the following two methods exist in scripts/build_utils.sh
-pkgs=( "tox" )
-install_python_packages "pkgs[@]"
-
-WORKDIR=$(mktemp -td tox.XXXXXXXXXX)
-
-cd $WORKSPACE/tests/functional
-
-INSTALLER_DEV_BRANCH=$INSTALLER_BRANCH CEPH_ANSIBLE_DEV_BRANCH=$CEPH_ANSIBLE_BRANCH $VENV/tox -rv -e=ansible2.2-nightly --workdir=$WORKDIR -- --provider=libvirt
diff --git a/ceph-installer-nightly/config/definitions/ceph-installer-nightly.yml b/ceph-installer-nightly/config/definitions/ceph-installer-nightly.yml
deleted file mode 100644
index 92769832..00000000
--- a/ceph-installer-nightly/config/definitions/ceph-installer-nightly.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-- job:
-    name: ceph-installer-nightly
-    node: vagrant && libvirt 
-    project-type: freestyle
-    defaults: global
-    display-name: 'ceph-installer: Nightly tests for ceph-installer and ceph-ansible integration'
-    quiet-period: 5
-    block-downstream: false
-    block-upstream: false
-    retry-count: 3
-    properties:
-      - github:
-          url: https://github.com/ceph/ceph-installer
-    logrotate:
-      daysToKeep: -1
-      numToKeep: -1
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
-
-    parameters:
-      - string:
-          name: INSTALLER_BRANCH
-          description: "The ceph-installer branch (or tag) to test"
-          default: master
-
-      - string:
-          name: CEPH_ANSIBLE_BRANCH
-          description: "The ceph-ansible branch (or tag) to test"
-          default: master
-
-    triggers:
-      - timed: '@daily'
-
-    scm:
-      - git:
-          url: https://github.com/ceph/ceph-installer.git
-          branches:
-            - $INSTALLER_BRANCH 
-          browser: auto
-          timeout: 20
-
-    builders:
-      - shell:
-          !include-raw:
-            - ../../../scripts/build_utils.sh
-            - ../../build/build
-
-    publishers:
-      - email:
-          recipients: aschoen@redhat.com adeza@redhat.com
diff --git a/ceph-installer-tests/build/build b/ceph-installer-tests/build/build
new file mode 100644
index 00000000..413c71a9
--- /dev/null
+++ b/ceph-installer-tests/build/build
@@ -0,0 +1,9 @@
+# the following two methods exist in scripts/build_utils.sh
+pkgs=( "tox" )
+install_python_packages "pkgs[@]"
+
+WORKDIR=$(mktemp -td tox.XXXXXXXXXX)
+
+cd $WORKSPACE/tests/functional
+
+INSTALLER_DEV_BRANCH=$INSTALLER_BRANCH CEPH_ANSIBLE_DEV_BRANCH=$CEPH_ANSIBLE_BRANCH $VENV/tox -rv -e=$SCENARIO --workdir=$WORKDIR -- --provider=libvirt
diff --git a/ceph-installer-tests/config/definitions/ceph-installer-tests.yml b/ceph-installer-tests/config/definitions/ceph-installer-tests.yml
new file mode 100644
index 00000000..ddf2fc46
--- /dev/null
+++ b/ceph-installer-tests/config/definitions/ceph-installer-tests.yml
@@ -0,0 +1,61 @@
+- project:
+    name: ceph-installer-tests
+    scenario:
+      - ansible2.2-nightly_centos7
+      - ansible2.2-nightly_xenial
+    jobs:
+        - 'ceph-installer-tests-{scenario}'
+
+- job-template:
+    name: 'ceph-installer-tests-{scenario}'
+    node: vagrant && libvirt 
+    project-type: freestyle
+    defaults: global
+    display-name: 'ceph-installer: Tests [{scenario}]'
+    quiet-period: 5
+    block-downstream: false
+    block-upstream: false
+    retry-count: 3
+    properties:
+      - github:
+          url: https://github.com/ceph/ceph-installer
+    logrotate:
+      daysToKeep: -1
+      numToKeep: -1
+      artifactDaysToKeep: -1
+      artifactNumToKeep: -1
+
+    parameters:
+      - string:
+          name: INSTALLER_BRANCH
+          description: "The ceph-installer branch (or tag) to test"
+          default: master
+
+      - string:
+          name: CEPH_ANSIBLE_BRANCH
+          description: "The ceph-ansible branch (or tag) to test"
+          default: master
+
+    triggers:
+      - timed: '@daily'
+
+    scm:
+      - git:
+          url: https://github.com/ceph/ceph-installer.git
+          branches:
+            - $INSTALLER_BRANCH 
+          browser: auto
+          timeout: 20
+
+    builders:
+      - inject:
+          properties-content: |
+            SCENARIO={scenario}
+      - shell:
+          !include-raw-escape:
+            - ../../../scripts/build_utils.sh
+            - ../../build/build
+
+    publishers:
+      - email:
+          recipients: aschoen@redhat.com adeza@redhat.com