Skip to content

Forward merge 5.x main - #1390

Open
Kehrlann wants to merge 29 commits into
mainfrom
dgarnier/forward-merge-5.x-main
Open

Kehrlann wants to merge 29 commits into
mainfrom
dgarnier/forward-merge-5.x-main

Conversation

@Kehrlann

Copy link
Copy Markdown
Contributor

No description provided.

jorbaum and others added 29 commits April 29, 2026 17:47
- Some deployments have TCP routes org quotas set to 0. This adds a
  property, TEST_QUOTAS_ROUTES_RESERVEDPORTS, to update org quotas on
  test bootstrap.

Signed-off-by: Daniel Garnier-Moiroux <daniel.garnier-moiroux@broadcom.com>
* feat: adds schema support for app features
* make compatibilityChecker robust if v2 api is disabled

Co-authored-by: Georg Lokowandt <georg.lokowandt@sap.com>
update dependencies, still supporting java8 #1367
Backport of 59d0e90

Signed-off-by: Daniel Garnier-Moiroux <daniel.garnier-moiroux@broadcom.com>
Refactor _RouteOptions class to handle added options in future

Fixes #1365
Fixes #1339

Signed-off-by: Daniel Garnier-Moiroux <daniel.garnier-moiroux@broadcom.com>
Showed up when we downloaded tar archives with ClassDefNotFound
InfoTest fails if running against a CF where v2 API is disabled.
OrganizationsTest fails when running in kind-deployment landscape.

The package "serviceInstances" (with capital "I") does not match the package
declaration in the contained class. This creates problems in Eclipse on Windows.

The old docker image in ApplicationsTest.pushNewDocker
was outdated and did not work
on recent docker versions. Switching to the image of
a better supported test application.

Fixes #1363
…PI (#1383)

* fix: Adapt the client and the integration tests to the KinD based CAPI

Make the integration tests pass against a CAPI deployed on KinD.

Client:
- Send the "resources" field with every bits upload (v3 packages) and
  also as query parameter for v2 uploads without matched resources, as
  CAPI otherwise rejects them (CF-AppBitsUploadInvalid / missing
  :resources).
- Add the CA certificates of the LDAP and SAML identity provider
  configurations.

Integration tests:
- Reserve the TCP ports handed out by the NameFactory on the default-tcp
  router group at startup, so the TCP route tests don't depend on the
  test order or the deployment's default range. Skipped together with
  the TCP routing tests (SKIP_TCP_ROUTING_TESTS).
@Kehrlann
Kehrlann force-pushed the dgarnier/forward-merge-5.x-main branch from fc5271c to 0a9891d Compare October 16, 2026 12:29

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants