SpringCloud/spring-cloud-app-broker
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(2.1.x) Backporting cflinuxfs4

Browse Source
This commit is contained in:
Alberto C. Ríos
2024-03-07 12:35:00 +01:00
parent 0565eb55e2
commit 976de1272c
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-app-broker-acceptance-tests/src/test/java/org/springframework/cloud/appbroker/acceptance/CreateInstanceAcceptanceTest.java
View File

@@ -70,7 +70,7 @@ class CreateInstanceAcceptanceTest extends CloudFoundryAcceptanceTest {
"spring.cloud.appbroker.services[0].apps[1].name=" + APP_CREATE_2,
"spring.cloud.appbroker.services[0].apps[1].path=" + BACKING_APP_PATH,
"spring.cloud.appbroker.deployer.cloudfoundry.properties.stack=cflinuxfs3"
"spring.cloud.appbroker.deployer.cloudfoundry.properties.stack=cflinuxfs4"
})
void deployAppsOnCreateService() {
// when a service instance is created
@@ -92,7 +92,7 @@ class CreateInstanceAcceptanceTest extends CloudFoundryAcceptanceTest {
// and stack is updated when specified
Optional<ApplicationDetail> application1Detail = getApplicationDetail(APP_CREATE_1);
assertThat(application1Detail).hasValueSatisfying(app -> {
assertThat(app.getStack()).isEqualTo("cflinuxfs3");
assertThat(app.getStack()).isEqualTo("cflinuxfs4");
});
// and has the environment variables

4
spring-cloud-app-broker-acceptance-tests/src/test/java/org/springframework/cloud/appbroker/acceptance/UpgradeInstanceAcceptanceTest.java
View File

@@ -113,7 +113,7 @@ class UpgradeInstanceAcceptanceTest extends CloudFoundryAcceptanceTest {
"spring.cloud.appbroker.services[0].apps[0].environment.parameter3=new-config3",
"spring.cloud.appbroker.services[0].apps[0].parameters-transformers[0].name=PropertyMapping",
"spring.cloud.appbroker.services[0].apps[0].parameters-transformers[0].args.include=upgrade",
"spring.cloud.appbroker.deployer.cloudfoundry.properties.stack=cflinuxfs3"
"spring.cloud.appbroker.deployer.cloudfoundry.properties.stack=cflinuxfs4"
})
void upgradesTheServiceInstanceWithNewBackingServiceAndEnvironmentVariables() {
// when the service instance is updated with a new service
@@ -133,7 +133,7 @@ class UpgradeInstanceAcceptanceTest extends CloudFoundryAcceptanceTest {
// and stack is updated when specified
Optional<ApplicationDetail> application1Detail = getApplicationDetail(APP_NAME);
assertThat(application1Detail).hasValueSatisfying(app -> {
assertThat(app.getStack()).isEqualTo("cflinuxfs3");
assertThat(app.getStack()).isEqualTo("cflinuxfs4");
});
// then the backing application was updated with zero downtime

2
spring-cloud-app-broker-deployer-cloudfoundry/src/test/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppDeployerTest.java
View File

@@ -519,7 +519,7 @@ class CloudFoundryAppDeployerTest {
.memoryLimit(100)
.requestedState("STARTED")
.runningInstances(2)
.stack("cflinuxfs3")
.stack("cflinuxfs4")
.build()));
given(clientApplications.summary(argThat(request -> appId.equals(request.getApplicationId()))))

2
spring-cloud-app-broker-integration-tests/src/test/resources/responses/cloudcontroller/get-v3-app-STARTED.json
View File

@@ -10,7 +10,7 @@
"buildpacks": [
"java_buildpack"
],
"stack": "cflinuxfs3"
"stack": "cflinuxfs4"
}
},
"relationships": {