Fix CI for CI (#289)

* updates to ci-cd tooling

* remove template issue

* update to latest templates for pact broker default git url fix

* test whitespace fix for template, and sonarqube fix

* remove that silly override

* update sonarqube url for testing

* update with -community

* update to templates to v1.4.12, remove pact-broker-build, change generic sonarqube build to include imagestream from my fork (will update later)

* removing my branch

* put jenkins url back

inventory/group_vars/all.yml

@@ -2,12 +2,11 @@ ci_cd_namespace: labs-ci-cd
 dev_namespace: labs-dev
 test_namespace: labs-test
 
-# When the ocp_templates gets moved to cop land we can merge the two raws below
 openshift_templates_raw: "https://raw.githubusercontent.com/redhat-cop/openshift-templates"
-openshift_templates_raw_version_tag: "v1.4.10"
+openshift_templates_raw_version_tag: "v1.4.12"
 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.13"
+cop_quickstarts_raw_version_tag: "v1.14"
 
 ci_cd:
   NAMESPACE: "{{ ci_cd_namespace }}"

inventory/host_vars/ci-cd-tooling.yml

@@ -96,6 +96,9 @@ sonarqube:
     SOURCE_REPOSITORY_URL: "{{ cop_quickstarts }}"
     SOURCE_REPOSITORY_REF: "{{ cop_quickstarts_raw_version_tag }}"
     SOURCE_CONTEXT_DIR: sonarqube
+    FROM_DOCKER_IMAGE: sonarqube
+    FROM_DOCKER_TAG: "7.7-community"
+    FROM_DOCKER_IMAGE_REGISTRY_URL: "docker.io/sonarqube"
   postgresql:
     POSTGRESQL_DATABASE: sonar
     VOLUME_CAPACITY: 5Gi
@@ -124,11 +127,6 @@ hoverfly:
     MEMORY_LIMIT: 2Gi
     HOVERFLY_IMAGE_STREAM_TAG: "{{ hoverfly_name }}:latest"
 
-pact_broker:
-  POSTGRESQL_USERNAME: pact_broker_user
-  POSTGRESQL_PERSISTENT_VOLUME_CLAIM_SIZE: 5Gi
-  GIT_REPOSITORY: https://github.com/DiUS/pact_broker-docker.git
-
 openshift_cluster_content:
 - galaxy_requirements:
   - pre_post_requirements.yml # Uses openshift-label role from casl-ansible
@@ -162,21 +160,13 @@ openshift_cluster_content:
     - hoverfly
     - ci-cd-builds
   - name: sonarqube
-    template: "{{ cop_quickstarts_raw }}/{{ cop_quickstarts_raw_version_tag }}/build-docker-generic/.openshift/templates/docker-build-template.yml"
+    template: "{{ cop_quickstarts_raw }}/{{ cop_quickstarts_raw_version_tag }}/build-docker-generic/.openshift/templates/docker-build-template-override-FROM.yml"
     params_from_vars: "{{ sonarqube.build }}"
     namespace: "{{ ci_cd_namespace }}"
     tags:
     - sonarqube
     - sonarqube-build
     - ci-cd-builds
-  - name: pact-broker
-    template: "{{ openshift_templates_raw }}/{{ openshift_templates_raw_version_tag }}/pact-broker/pact-broker-build.yml"
-    params_from_vars: "{{ pact_broker }}"
-    namespace: "{{ ci_cd_namespace }}"
-    tags:
-      - pact-broker
-      - pact-broker-build
-      - ci-cd-builds
 
 # Secrets stored in OCP land and sync'd to Jenkins for consumption
 - object: ci-cd-secrets
@@ -290,7 +280,6 @@ openshift_cluster_content:
       - ci-cd-deployments
   - name: pact-broker
     template: "{{ openshift_templates_raw }}/{{ openshift_templates_raw_version_tag }}/pact-broker/pact-broker-deploy.yml"
-    params_from_vars: "{{ pact_broker }}"
     namespace: "{{ ci_cd_namespace }}"
     tags:
       - pact-broker