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 whitespace issue #47

Merged
merged 3 commits into from
Aug 14, 2019
Merged

Fix whitespace issue #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
613492d
DiUS pact-broker for docker is deprecated and not working. update def…
pcarney8 Aug 14, 2019
ce97eda
Merge branch 'master' of github.com:redhat-cop/openshift-templates
pcarney8 Aug 14, 2019
4f3f0a3
somehow whitespace got messed up
pcarney8 Aug 14, 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
18 changes: 9 additions & 9 deletions jenkins/jenkins-ephemeral-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,17 +205,17 @@ parameters:
displayName: Enable OAuth in Jenkins
name: ENABLE_OAUTH
value: "true"
- description: Whether Jenkins runs with a 32 bit (i386) or 64 bit (x86_64) JVM.
displayName: Jenkins JVM Architecture
name: JVM_ARCH
value: i386
- description: Whether Jenkins runs with a 32 bit (i386) or 64 bit (x86_64) JVM.
displayName: Jenkins JVM Architecture
name: JVM_ARCH
value: i386
- description: Maximum amount of memory the container can use.
displayName: Memory Limit
name: MEMORY_LIMIT
value: 2Gi
- description: Starting request of memory the container can use.
displayName: Memory Request
name: MEMORY_REQUEST
value: 2Gi
- description: Starting request of memory the container can use.
displayName: Memory Request
name: MEMORY_REQUEST
value: 512Mi
- description: Volume space available for data, e.g. 512Mi, 2Gi.
displayName: Volume Capacity
Expand Down Expand Up @@ -275,4 +275,4 @@ parameters:
- description: GitLab group name where projects are stored
displayName: GitLab group name where projects are stored
name: GITLAB_GROUP_NAME
value: rht-labs
value: rht-labs
18 changes: 9 additions & 9 deletions jenkins/jenkins-persistent-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,17 +222,17 @@ parameters:
displayName: Enable OAuth in Jenkins
name: ENABLE_OAUTH
value: "true"
- description: Whether Jenkins runs with a 32 bit (i386) or 64 bit (x86_64) JVM.
displayName: Jenkins JVM Architecture
name: JVM_ARCH
value: i386
- description: Whether Jenkins runs with a 32 bit (i386) or 64 bit (x86_64) JVM.
displayName: Jenkins JVM Architecture
name: JVM_ARCH
value: i386
- description: Maximum amount of memory the container can use.
displayName: Memory Limit
name: MEMORY_LIMIT
value: 2Gi
- description: Starting request of memory the container can use.
displayName: Memory Request
name: MEMORY_REQUEST
value: 2Gi
- description: Starting request of memory the container can use.
displayName: Memory Request
name: MEMORY_REQUEST
value: 512Mi
- description: Volume space available for data, e.g. 512Mi, 2Gi.
displayName: Volume Capacity
Expand Down Expand Up @@ -292,4 +292,4 @@ parameters:
- description: GitLab group name where projects are stored
displayName: GitLab group name where projects are stored
name: GITLAB_GROUP_NAME
value: rht-labs
value: rht-labs