From db14cd3d2fafe79535a2fa4d3b5b563ca929cb3d Mon Sep 17 00:00:00 2001 From: Anthony Dahanne Date: Mon, 19 Feb 2024 15:12:03 -0500 Subject: [PATCH 1/3] Provide more info about deploy --- ci/deploy.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/deploy.sh b/ci/deploy.sh index bb4e47d7fc..567ed030cc 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -set -euo pipefail +set -euox pipefail [[ -d $PWD/maven && ! -d $HOME/.m2 ]] && ln -s $PWD/maven $HOME/.m2 @@ -28,4 +28,4 @@ cat < ~/.m2/settings.xml EOF cd cf-java-client -./mvnw -q -Dmaven.test.skip=true deploy +./mvnw -Dmaven.test.skip=true deploy From 9bca50fb48bb8dec40ff2106fa16bc0d53ff48ca Mon Sep 17 00:00:00 2001 From: Anthony Dahanne Date: Mon, 19 Feb 2024 15:15:00 -0500 Subject: [PATCH 2/3] Revert to 5.11.0 * 5.11.0 was never released --- cloudfoundry-client-reactor/pom.xml | 2 +- cloudfoundry-client/pom.xml | 2 +- cloudfoundry-operations/pom.xml | 2 +- cloudfoundry-util/pom.xml | 2 +- integration-test/pom.xml | 2 +- pom.xml | 2 +- test-log-cache/pom.xml | 2 +- test-service-broker/pom.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cloudfoundry-client-reactor/pom.xml b/cloudfoundry-client-reactor/pom.xml index 0f59f8b342..e64905c381 100644 --- a/cloudfoundry-client-reactor/pom.xml +++ b/cloudfoundry-client-reactor/pom.xml @@ -25,7 +25,7 @@ org.cloudfoundry cloudfoundry-java-client - 5.12.0.BUILD-SNAPSHOT + 5.11.0.BUILD-SNAPSHOT cloudfoundry-client-reactor diff --git a/cloudfoundry-client/pom.xml b/cloudfoundry-client/pom.xml index 6dfdb0aec4..9b9471b5f3 100644 --- a/cloudfoundry-client/pom.xml +++ b/cloudfoundry-client/pom.xml @@ -25,7 +25,7 @@ org.cloudfoundry cloudfoundry-java-client - 5.12.0.BUILD-SNAPSHOT + 5.11.0.BUILD-SNAPSHOT cloudfoundry-client diff --git a/cloudfoundry-operations/pom.xml b/cloudfoundry-operations/pom.xml index 50b1e16cb8..8fce454acb 100644 --- a/cloudfoundry-operations/pom.xml +++ b/cloudfoundry-operations/pom.xml @@ -25,7 +25,7 @@ org.cloudfoundry cloudfoundry-java-client - 5.12.0.BUILD-SNAPSHOT + 5.11.0.BUILD-SNAPSHOT cloudfoundry-operations diff --git a/cloudfoundry-util/pom.xml b/cloudfoundry-util/pom.xml index e942dfcfbd..fc0825a6e5 100644 --- a/cloudfoundry-util/pom.xml +++ b/cloudfoundry-util/pom.xml @@ -25,7 +25,7 @@ org.cloudfoundry cloudfoundry-java-client - 5.12.0.BUILD-SNAPSHOT + 5.11.0.BUILD-SNAPSHOT cloudfoundry-util diff --git a/integration-test/pom.xml b/integration-test/pom.xml index c7f8e86a6e..3380271410 100644 --- a/integration-test/pom.xml +++ b/integration-test/pom.xml @@ -25,7 +25,7 @@ org.cloudfoundry cloudfoundry-java-client - 5.12.0.BUILD-SNAPSHOT + 5.11.0.BUILD-SNAPSHOT integration-test diff --git a/pom.xml b/pom.xml index e076ca6530..2c9e58f93d 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ cloudfoundry-java-client Cloud Foundry Java Client Parent A Java language binding for interacting with a Cloud Foundry instance - 5.12.0.BUILD-SNAPSHOT + 5.11.0.BUILD-SNAPSHOT pom https://github.com/cloudfoundry/cf-java-client diff --git a/test-log-cache/pom.xml b/test-log-cache/pom.xml index b0acf66c67..54d59a6261 100644 --- a/test-log-cache/pom.xml +++ b/test-log-cache/pom.xml @@ -25,7 +25,7 @@ org.cloudfoundry cloudfoundry-java-client - 5.12.0.BUILD-SNAPSHOT + 5.11.0.BUILD-SNAPSHOT test-log-cache diff --git a/test-service-broker/pom.xml b/test-service-broker/pom.xml index f86e316dde..fce8741c19 100644 --- a/test-service-broker/pom.xml +++ b/test-service-broker/pom.xml @@ -25,7 +25,7 @@ org.cloudfoundry cloudfoundry-java-client - 5.12.0.BUILD-SNAPSHOT + 5.11.0.BUILD-SNAPSHOT test-service-broker From 52cc2dcaa5030a8e7882fbf4ec871af67932eed4 Mon Sep 17 00:00:00 2001 From: David O'Sullivan Date: Tue, 20 Feb 2024 10:08:29 +0000 Subject: [PATCH 3/3] revert changes to integration test env resources --- ci/tcp-routes.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/ci/tcp-routes.yml b/ci/tcp-routes.yml index bcb7b96a5b..306d30ce69 100644 --- a/ci/tcp-routes.yml +++ b/ci/tcp-routes.yml @@ -18,13 +18,10 @@ - type: replace path: /resource-config/tcp_router/instances value: automatic +- type: replace + path: /resource-config/compute/instances + value: 2 - type: replace path: /product-properties/.cloud_controller.default_quota_memory_limit_mb value: value: ((DEFAULT_QUOTA_MEM_MB)) -- type: replace - path: /resource-config/compute/instances - value: 4 -- type: replace - path: /resource-config/compute/instance_type/id - value: "2xlarge.mem"