Merge pull request CentOS-PaaS-SIG#438 from herlo/beaker_fixes

Minor Beaker fixes
herlo · Dec 22, 2017 · 9ac4d29 · 9ac4d29
2 parents 28bd4b1 + 2a996c3
commit 9ac4d29
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/docs/source/examples/workspace/PinFile.jenkins.j2 b/docs/source/examples/workspace/PinFile.jenkins.j2
@@ -1,5 +1,5 @@
 jenkins-slave:
-  topology: jenkins-slave.yml
+  topology: jenkins-slave.j2
   layout: jenkins-slave.yml
   {% if hooks %}
   hooks:

diff --git a/docs/source/examples/workspace/topologies/jenkins-slave.j2 b/docs/source/examples/workspace/topologies/jenkins-slave.j2
@@ -5,7 +5,7 @@ resource_groups:
   resource_group_type: beaker
   resource_definitions:
   - role: bkr_server
-    job_group: multiarch-qe
+    job_group: "{{ job_group }}"
     whiteboard: "{{ arch }} slave for multiarch testing"
     recipesets:
     - distro: RHEL-7.4

diff --git a/linchpin/provision/beaker.yml b/linchpin/provision/beaker.yml
@@ -26,4 +26,4 @@
     - role: 'inventory_gen'
       when:
         - state == 'present'
-        - layout_file is defined or layout is defined
+        - layout_data is defined
diff --git a/linchpin/provision/roles/beaker/files/schema.json b/linchpin/provision/roles/beaker/files/schema.json
@@ -10,7 +10,7 @@
                     "allowed": ["bkr_server"]
                 },
                 "whiteboard": { "type": "string", "required": true },
-                "job_group": { "type": "string", "required": true },
+                "job_group": { "type": "string", "required": false },
                 "recipesets": {
                     "type": "list",
                     "schema": {