Fix jenkins-slaves for OCP4 (#288)

* Update to v1.12 slaves for OCP4 * Update to containers-quickstarts v1.13
rht-labs · Aug 14, 2019 · 4b3ebcc · 4b3ebcc
1 parent 4a1bc5a
commit 4b3ebcc
Show file tree

Hide file tree

Showing 12 changed files with 55 additions and 119 deletions.
diff --git a/inventory/group_vars/all.yml b/inventory/group_vars/all.yml
@@ -7,7 +7,7 @@ openshift_templates_raw: "https://raw.githubusercontent.com/redhat-cop/openshift
 openshift_templates_raw_version_tag: "v1.3"
 cop_quickstarts: "https://github.com/redhat-cop/containers-quickstarts.git"
 cop_quickstarts_raw: "https://raw.githubusercontent.com/redhat-cop/containers-quickstarts"
-cop_quickstarts_raw_version_tag: "v1.9"
+cop_quickstarts_raw_version_tag: "v1.13"
 
 ci_cd:
   NAMESPACE: "{{ ci_cd_namespace }}"

diff --git a/inventory/host_vars/ci-cd-tooling.yml b/inventory/host_vars/ci-cd-tooling.yml
@@ -32,6 +32,56 @@ jenkins:
     GITLAB_TOKEN: "token123"
     GITLAB_GROUP_NAME: "rht-labs"
 
+jenkins_slaves:
+  build:
+    ansible:
+      NAME: jenkins-slave-ansible
+      SOURCE_CONTEXT_DIR: jenkins-slaves/jenkins-slave-ansible
+      SOURCE_REPOSITORY_REF: "{{ cop_quickstarts_raw_version_tag }}"
+      SOURCE_REPOSITORY_URL: "{{ cop_quickstarts }}"
+    arachni:
+      NAME: jenkins-slave-arachni
+      SOURCE_CONTEXT_DIR: jenkins-slaves/jenkins-slave-arachni
+      SOURCE_REPOSITORY_REF: "{{ cop_quickstarts_raw_version_tag }}"
+      SOURCE_REPOSITORY_URL: "{{ cop_quickstarts }}"
+    python:
+      NAME: jenkins-slave-python
+      SOURCE_CONTEXT_DIR: jenkins-slaves/jenkins-slave-python
+      SOURCE_REPOSITORY_REF: "{{ cop_quickstarts_raw_version_tag }}"
+      SOURCE_REPOSITORY_URL: "{{ cop_quickstarts }}"
+    golang:
+      NAME: jenkins-slave-golang
+      SOURCE_CONTEXT_DIR: jenkins-slaves/jenkins-slave-golang
+      SOURCE_REPOSITORY_REF: "{{ cop_quickstarts_raw_version_tag }}"
+      SOURCE_REPOSITORY_URL: "{{ cop_quickstarts }}"
+    gradle:
+      NAME: jenkins-slave-gradle
+      SOURCE_CONTEXT_DIR: jenkins-slaves/jenkins-slave-gradle
+      SOURCE_REPOSITORY_REF: "{{ cop_quickstarts_raw_version_tag }}"
+      SOURCE_REPOSITORY_URL: "{{ cop_quickstarts }}"
+    mongodb:
+      NAME: jenkins-slave-mongodb
+      SOURCE_CONTEXT_DIR: jenkins-slaves/jenkins-slave-mongodb
+      SOURCE_REPOSITORY_REF: "{{ cop_quickstarts_raw_version_tag }}"
+      SOURCE_REPOSITORY_URL: "{{ cop_quickstarts }}"
+    mvn:
+      NAME: jenkins-slave-mvn
+      SOURCE_CONTEXT_DIR: jenkins-slaves/jenkins-slave-mvn
+      SOURCE_REPOSITORY_REF: "{{ cop_quickstarts_raw_version_tag }}"
+      SOURCE_REPOSITORY_URL: "{{ cop_quickstarts }}"
+    npm:
+      BUILDER_IMAGE_NAME: openshift/jenkins-slave-base-centos7:v3.11
+      NAME: jenkins-slave-npm
+      SOURCE_CONTEXT_DIR: jenkins-slaves/jenkins-slave-npm
+      SOURCE_REPOSITORY_REF: "{{ cop_quickstarts_raw_version_tag }}"
+      SOURCE_REPOSITORY_URL: "{{ cop_quickstarts }}"
+    zap:
+      BUILDER_IMAGE_NAME: centos:centos7
+      NAME: jenkins-slave-zap
+      SOURCE_CONTEXT_DIR: jenkins-slaves/jenkins-slave-zap
+      SOURCE_REPOSITORY_REF: "{{ cop_quickstarts_raw_version_tag }}"
+      SOURCE_REPOSITORY_URL: "{{ cop_quickstarts }}"
+
 nexus:
   secret:
     SECRET_NAME: "nexus-password"
@@ -153,69 +203,12 @@ openshift_cluster_content:
 # Jenkins slave agents to give him some superpowers in OCP land
 - object: jenkins-slave-nodes
   content:
-  - name: jenkins-slave-mvn
-    template: "{{ cop_quickstarts_raw }}/{{ cop_quickstarts_raw_version_tag }}/jenkins-slaves/.openshift/templates/jenkins-slave-generic-template.yml"
-    params: "{{ inventory_dir }}/../params/jenkins-slaves/mvn"
+  - name: jenkins-slave-agents
+    template: "{{ cop_quickstarts_raw }}/{{ cop_quickstarts_raw_version_tag }}/.openshift/templates/jenkins-slave-generic-template.j2"
+    params_from_vars: "{{ jenkins_slaves.build }}"
     namespace: "{{ ci_cd_namespace }}"
     tags:
     - jenkins-slaves
-    - mvn-slave
-  - name: jenkins-slave-npm
-    template: "{{ cop_quickstarts_raw }}/{{ cop_quickstarts_raw_version_tag }}/jenkins-slaves/.openshift/templates/jenkins-slave-generic-template.yml"
-    params: "{{ inventory_dir }}/../params/jenkins-slaves/npm"
-    namespace: "{{ ci_cd_namespace }}"
-    tags:
-    - jenkins-slaves
-    - npm-slave
-  - name: jenkins-slave-zap
-    template: "{{ cop_quickstarts_raw }}/{{ cop_quickstarts_raw_version_tag }}/jenkins-slaves/.openshift/templates/jenkins-slave-generic-template.yml"
-    params: "{{ inventory_dir }}/../params/jenkins-slaves/zap"
-    namespace: "{{ ci_cd_namespace }}"
-    tags:
-    - jenkins-slaves
-    - zap-slave
-  - name: jenkins-slave-ansible
-    template: "{{ cop_quickstarts_raw }}/{{ cop_quickstarts_raw_version_tag }}/jenkins-slaves/.openshift/templates/jenkins-slave-generic-template.yml"
-    params: "{{ inventory_dir }}/../params/jenkins-slaves/ansible"
-    namespace: "{{ ci_cd_namespace }}"
-    tags:
-      - jenkins-slaves
-      - ansible-slave
-  - name: jenkins-slave-arachni
-    template: "{{ cop_quickstarts_raw }}/{{ cop_quickstarts_raw_version_tag }}/jenkins-slaves/.openshift/templates/jenkins-slave-generic-template.yml"
-    params: "{{ inventory_dir }}/../params/jenkins-slaves/arachni"
-    namespace: "{{ ci_cd_namespace }}"
-    tags:
-      - jenkins-slaves
-      - arachni-slave
-  - name: jenkins-slave-gradle
-    template: "{{ cop_quickstarts_raw }}/{{ cop_quickstarts_raw_version_tag }}/jenkins-slaves/.openshift/templates/jenkins-slave-generic-template.yml"
-    params: "{{ inventory_dir }}/../params/jenkins-slaves/gradle"
-    namespace: "{{ ci_cd_namespace }}"
-    tags:
-      - jenkins-slaves
-      - gradle-slave
-  - name: jenkins-slave-golang
-    template: "{{ cop_quickstarts_raw }}/{{ cop_quickstarts_raw_version_tag }}/jenkins-slaves/.openshift/templates/jenkins-slave-generic-template.yml"
-    params: "{{ inventory_dir }}/../params/jenkins-slaves/golang"
-    namespace: "{{ ci_cd_namespace }}"
-    tags:
-      - jenkins-slaves
-      - golang-slave
-  - name: jenkins-slave-mongodb
-    template: "{{ cop_quickstarts_raw }}/{{ cop_quickstarts_raw_version_tag }}/jenkins-slaves/.openshift/templates/jenkins-slave-generic-template.yml"
-    params: "{{ inventory_dir }}/../params/jenkins-slaves/mongodb"
-    namespace: "{{ ci_cd_namespace }}"
-    tags:
-      - jenkins-slaves
-      - mongodb-slave
-  - name: jenkins-slave-python
-    template: "{{ cop_quickstarts_raw }}/{{ cop_quickstarts_raw_version_tag }}/jenkins-slaves/.openshift/templates/jenkins-slave-generic-template.yml"
-    params: "{{ inventory_dir }}/../params/jenkins-slaves/python"
-    namespace: "{{ ci_cd_namespace }}"
-    tags:
-      - jenkins-slaves
-      - python-slave
 
 # CI/CD Deployments is the OpenShift Deployment Configs and all
 # supporting tooling, pre and post hooks needed to setup and configure a comprehensive tool chain

diff --git a/params/jenkins-slaves/ansible b/params/jenkins-slaves/ansible
diff --git a/params/jenkins-slaves/arachni b/params/jenkins-slaves/arachni
diff --git a/params/jenkins-slaves/golang b/params/jenkins-slaves/golang
diff --git a/params/jenkins-slaves/gradle b/params/jenkins-slaves/gradle
diff --git a/params/jenkins-slaves/mongodb b/params/jenkins-slaves/mongodb
diff --git a/params/jenkins-slaves/mvn b/params/jenkins-slaves/mvn
diff --git a/params/jenkins-slaves/npm b/params/jenkins-slaves/npm
diff --git a/params/jenkins-slaves/python b/params/jenkins-slaves/python
diff --git a/params/jenkins-slaves/zap b/params/jenkins-slaves/zap
diff --git a/requirements.yml b/requirements.yml
@@ -4,5 +4,5 @@
 # From 'openshift-applier'
 - src: https://github.com/redhat-cop/openshift-applier
   scm: git
-  version: v2.1.0
+  version: v2.1.1
   name: openshift-applier