From 494ce2fce4bd9dc6d8a20214f1aa0d1cb37497bb Mon Sep 17 00:00:00 2001 From: Patrick C Date: Wed, 14 Aug 2019 13:19:24 -0400 Subject: [PATCH] Updates for ocpv4 (#287) * updates to ci-cd tooling * remove template issue * remove the commented out lines, include a variable in the url that could be switched to persistent or ephemeral * add .swp to gitignore, and another tag for ci-for-ci * update Readme * change to use my branch * update with newest version of applier, change filter_tags to include_tags, and back out nexus role changes * updates for ocpv4 directed at branches in other repos * update with tags * move back to redhat-cop, woops :tada: --- inventory/group_vars/all.yml | 2 +- inventory/host_vars/ci-cd-tooling.yml | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/inventory/group_vars/all.yml b/inventory/group_vars/all.yml index 4f69b5fb..22c98a15 100644 --- a/inventory/group_vars/all.yml +++ b/inventory/group_vars/all.yml @@ -4,7 +4,7 @@ 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.3" +openshift_templates_raw_version_tag: "v1.4.10" 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" diff --git a/inventory/host_vars/ci-cd-tooling.yml b/inventory/host_vars/ci-cd-tooling.yml index e520f0b7..35f17d50 100644 --- a/inventory/host_vars/ci-cd-tooling.yml +++ b/inventory/host_vars/ci-cd-tooling.yml @@ -12,9 +12,7 @@ jenkins: build: NAME: "{{ jenkins_name }}" SOURCE_REPOSITORY_URL: https://github.com/rht-labs/s2i-config-jenkins.git - SOURCE_REPOSITORY_REF: v1.4 - BUILDER_IMAGE_STREAM_NAME: jenkins-2-rhel7 - BUILDER_IMAGE_STREAM_TAG_NAME: v3.11 + SOURCE_REPOSITORY_REF: v1.5 IMAGE_STREAM_NAMESPACE: "{{ ci_cd_namespace }}" SECRET_NAME: "jenkins-git-password" USERNAME: gitlab-sa @@ -23,7 +21,7 @@ jenkins: deploy: NAMESPACE: "{{ ci_cd_namespace }}" JENKINS_IMAGE_STREAM_TAG: "{{ jenkins_name }}:latest" - MEMORY_LIMIT: 8Gi + MEMORY_LIMIT: 6Gi JENKINS_OPTS: "--sessionTimeout=720" VOLUME_CAPACITY: 20Gi MEMORY_REQUEST: 2Gi