From 613492d6fb9c10778f33312d88e4b3d812d08162 Mon Sep 17 00:00:00 2001 From: Patrick Carney Date: Wed, 14 Aug 2019 14:04:04 -0400 Subject: [PATCH 1/2] DiUS pact-broker for docker is deprecated and not working. update default git repo for pact-broker from pact-foundation that is working --- pact-broker/pact-broker-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pact-broker/pact-broker-build.yml b/pact-broker/pact-broker-build.yml index 8d0ca4d..bece393 100644 --- a/pact-broker/pact-broker-build.yml +++ b/pact-broker/pact-broker-build.yml @@ -41,6 +41,6 @@ objects: parameters: - description: URL for pact_broker source code. displayName: URL for pact_broker source code - value: https://github.com/DiUS/pact_broker-docker.git + value: https://github.com/pact-foundation/pact-broker-docker.git name: GIT_REPOSITORY required: true \ No newline at end of file From 4f3f0a3bf7cc669fe346183ee05dda3a0ea37b0f Mon Sep 17 00:00:00 2001 From: Patrick Carney Date: Wed, 14 Aug 2019 15:16:56 -0400 Subject: [PATCH 2/2] somehow whitespace got messed up --- jenkins/jenkins-ephemeral-template.yml | 18 +++++++++--------- jenkins/jenkins-persistent-template.yml | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/jenkins/jenkins-ephemeral-template.yml b/jenkins/jenkins-ephemeral-template.yml index fded3c5..6ef0778 100644 --- a/jenkins/jenkins-ephemeral-template.yml +++ b/jenkins/jenkins-ephemeral-template.yml @@ -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 @@ -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 \ No newline at end of file + value: rht-labs diff --git a/jenkins/jenkins-persistent-template.yml b/jenkins/jenkins-persistent-template.yml index 74362e5..1ab43a9 100644 --- a/jenkins/jenkins-persistent-template.yml +++ b/jenkins/jenkins-persistent-template.yml @@ -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 @@ -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 \ No newline at end of file + value: rht-labs