Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CI for CI #289

Merged
merged 16 commits into from
Aug 23, 2019
Merged

Fix CI for CI #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
11cd906
updates to ci-cd tooling
pcarney8 Nov 20, 2018
cb39551
merge
pcarney8 Nov 30, 2018
6dad42e
remove template issue
pcarney8 Dec 20, 2018
63024c2
merge
pcarney8 Jan 25, 2019
97e7662
Merge branch 'master' of github.com:rht-labs/labs-ci-cd
pcarney8 May 1, 2019
69986bf
Merge branch 'master' of github.com:rht-labs/labs-ci-cd
pcarney8 May 31, 2019
8ad54b0
Merge branch 'master' of github.com:rht-labs/labs-ci-cd
pcarney8 Aug 12, 2019
c1775dc
Merge branch 'master' of github.com:rht-labs/labs-ci-cd
pcarney8 Aug 14, 2019
f27506c
update to latest templates for pact broker default git url fix
pcarney8 Aug 14, 2019
022405f
test whitespace fix for template, and sonarqube fix
pcarney8 Aug 14, 2019
8631f08
remove that silly override
pcarney8 Aug 14, 2019
31bcff9
update sonarqube url for testing
pcarney8 Aug 14, 2019
b95d54e
update with -community
pcarney8 Aug 15, 2019
8b20bab
update to templates to v1.4.12, remove pact-broker-build, change gene…
pcarney8 Aug 22, 2019
68fa8da
removing my branch
pcarney8 Aug 22, 2019
9f5bdcc
put jenkins url back
pcarney8 Aug 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions inventory/group_vars/all.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
19 changes: 4 additions & 15 deletions inventory/host_vars/ci-cd-tooling.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down