Skip to content

Commit

Permalink
Updates for ocpv4 (#287)
Browse files Browse the repository at this point in the history
* 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 🎉
  • Loading branch information
pcarney8 authored and oybed committed Aug 14, 2019
1 parent 4b3ebcc commit 494ce2f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion inventory/group_vars/all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 2 additions & 4 deletions inventory/host_vars/ci-cd-tooling.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 494ce2f

Please sign in to comment.