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.

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

[3.15] Enforce Ubuntu 22.04 images for 3.15 #45455

Merged
merged 1 commit into from
Jan 8, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/matrix-jvm-tests.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
"java-version": 17,
"maven_args": "$JVM_TEST_MAVEN_ARGS",
"maven_opts": "-Xmx2g -XX:MaxMetaspaceSize=1g",
"os-name": "ubuntu-latest"
"os-name": "ubuntu-22.04"
}
, {
"name": "21",
"java-version": 21,
"java-version-gradle": 20,
"maven_args": "$JVM_TEST_MAVEN_ARGS",
"maven_opts": "-Xmx3g -XX:MaxMetaspaceSize=1g",
"os-name": "ubuntu-latest"
"os-name": "ubuntu-22.04"
}
, {
"name": "17 Windows",
Expand Down
48 changes: 24 additions & 24 deletions .github/native-tests.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,133 +4,133 @@
"category": "Main",
"timeout": 45,
"test-modules": "main",
"os-name": "ubuntu-latest"
"os-name": "ubuntu-22.04"
},
{
"category": "Data1",
"timeout": 95,
"test-modules": "jpa-h2, jpa-h2-embedded, jpa-mariadb, jpa-mssql, jpa-derby, jpa-without-entity, hibernate-orm-tenancy/datasource, hibernate-orm-tenancy/connection-resolver, hibernate-orm-tenancy/connection-resolver-legacy-qualifiers",
"os-name": "ubuntu-latest"
"os-name": "ubuntu-22.04"
},
{
"category": "Data2",
"timeout": 70,
"test-modules": "jpa, jpa-mapping-xml/legacy-app, jpa-mapping-xml/modern-app, jpa-mysql, jpa-db2, jpa-oracle",
"os-name": "ubuntu-latest"
"os-name": "ubuntu-22.04"
},
{
"category": "Data3",
"timeout": 75,
"test-modules": "flyway, hibernate-orm-panache, hibernate-orm-panache-kotlin, hibernate-orm-envers, liquibase, liquibase-mongodb",
"os-name": "ubuntu-latest"
"os-name": "ubuntu-22.04"
},
{
"category": "Data4",
"timeout": 60,
"test-modules": "mongodb-client, mongodb-devservices, mongodb-panache, mongodb-rest-data-panache, mongodb-panache-kotlin, redis-client, hibernate-orm-rest-data-panache",
"os-name": "ubuntu-latest"
"os-name": "ubuntu-22.04"
},
{
"category": "Data5",
"timeout": 70,
"test-modules": "jpa-postgresql, jpa-postgresql-withxml, narayana-stm, narayana-jta, reactive-pg-client, hibernate-reactive-postgresql, hibernate-orm-tenancy/schema",
"os-name": "ubuntu-latest"
"os-name": "ubuntu-22.04"
},
{
"category": "Data6",
"timeout": 105,
"test-modules": "elasticsearch-rest-client, elasticsearch-java-client, hibernate-search-orm-elasticsearch, hibernate-search-orm-elasticsearch-tenancy, hibernate-search-orm-opensearch, hibernate-search-orm-elasticsearch-outbox-polling, hibernate-search-standalone-elasticsearch, hibernate-search-standalone-opensearch",
"os-name": "ubuntu-latest"
"os-name": "ubuntu-22.04"
},
{
"category": "Data7",
"timeout": 85,
"test-modules": "reactive-oracle-client, reactive-mysql-client, reactive-db2-client, hibernate-reactive-db2, hibernate-reactive-mariadb, hibernate-reactive-mysql, hibernate-reactive-mysql-agroal-flyway, hibernate-reactive-panache, hibernate-reactive-panache-kotlin",
"os-name": "ubuntu-latest"
"os-name": "ubuntu-22.04"
},
{
"category": "Amazon",
"timeout": 80,
"test-modules": "amazon-lambda, amazon-lambda-http, amazon-lambda-rest-funqy, amazon-lambda-rest-servlet, amazon-lambda-rest-reactive-routes, amazon-lambda-rest-resteasy-reactive",
"os-name": "ubuntu-latest"
"os-name": "ubuntu-22.04"
},
{
"category": "Messaging1",
"timeout": 115,
"test-modules": "kafka, kafka-ssl, kafka-sasl, kafka-avro-apicurio2, kafka-json-schema-apicurio2, kafka-snappy, kafka-streams, reactive-messaging-kafka, kafka-oauth-keycloak",
"os-name": "ubuntu-latest"
"os-name": "ubuntu-22.04"
},
{
"category": "Messaging2",
"timeout": 80,
"test-modules": "reactive-messaging-amqp, reactive-messaging-rabbitmq, reactive-messaging-rabbitmq-dyn, reactive-messaging-pulsar",
"os-name": "ubuntu-latest"
"os-name": "ubuntu-22.04"
},
{
"category": "Security1",
"timeout": 65,
"test-modules": "elytron-security-oauth2, elytron-security, elytron-security-jdbc, elytron-undertow, elytron-security-ldap, bouncycastle, bouncycastle-jsse, bouncycastle-fips",
"os-name": "ubuntu-latest"
"os-name": "ubuntu-22.04"
},
{
"category": "Security2",
"timeout": 75,
"test-modules": "oidc, oidc-code-flow, oidc-tenancy, oidc-client, oidc-client-reactive, oidc-token-propagation, oidc-wiremock, oidc-client-wiremock",
"os-name": "ubuntu-latest"
"os-name": "ubuntu-22.04"
},
{
"category": "Security3",
"timeout": 55,
"test-modules": "keycloak-authorization, smallrye-jwt-token-propagation, security-webauthn",
"os-name": "ubuntu-latest"
"os-name": "ubuntu-22.04"
},
{
"category": "Cache",
"timeout": 75,
"test-modules": "infinispan-cache-jpa, infinispan-client, cache, redis-cache, infinispan-cache",
"os-name": "ubuntu-latest"
"os-name": "ubuntu-22.04"
},
{
"category": "HTTP",
"timeout": 120,
"test-modules": "elytron-resteasy, resteasy-jackson, elytron-resteasy-reactive, resteasy-mutiny, resteasy-reactive-kotlin/standard, vertx, vertx-http, vertx-web, vertx-http-compressors/all, vertx-http-compressors/some, vertx-web-jackson, vertx-graphql, virtual-http, rest-client, rest-client-reactive, rest-client-reactive-stork, rest-client-reactive-multipart, websockets, management-interface, management-interface-auth, mutiny-native-jctools",
"os-name": "ubuntu-latest"
"os-name": "ubuntu-22.04"
},
{
"category": "Misc1",
"timeout": 70,
"test-modules": "maven, jackson, jsonb, kotlin-serialization, rest-client-reactive-kotlin-serialization, quartz, qute, logging-min-level-unset, logging-min-level-set, simple with space",
"os-name": "ubuntu-latest"
"os-name": "ubuntu-22.04"
},
{
"category": "Misc2",
"timeout": 75,
"test-modules": "hibernate-validator, test-extension/tests, logging-gelf, mailer, native-config-profile, locales/all, locales/some",
"os-name": "ubuntu-latest"
"os-name": "ubuntu-22.04"
},
{
"category": "Misc3",
"timeout": 80,
"test-modules": "kubernetes-client, openshift-client, kubernetes-service-binding-jdbc, smallrye-config, smallrye-graphql, smallrye-graphql-client, smallrye-graphql-client-keycloak, smallrye-metrics",
"os-name": "ubuntu-latest"
"os-name": "ubuntu-22.04"
},
{
"category": "Misc4",
"timeout": 130,
"test-modules": "picocli-native, gradle, micrometer-mp-metrics, micrometer-prometheus, logging-json, jaxp, jaxb, opentelemetry, opentelemetry-jdbc-instrumentation, opentelemetry-mongodb-client-instrumentation, opentelemetry-redis-instrumentation, web-dependency-locator",
"os-name": "ubuntu-latest"
"os-name": "ubuntu-22.04"
},
{
"category": "Spring",
"timeout": 60,
"test-modules": "spring-di, spring-web, spring-data-jpa, spring-boot-properties, spring-cloud-config-client, spring-data-rest",
"os-name": "ubuntu-latest"
"os-name": "ubuntu-22.04"
},
{
"category": "gRPC",
"timeout": 80,
"test-modules": "grpc-health, grpc-interceptors, grpc-mutual-auth, grpc-plain-text-gzip, grpc-plain-text-mutiny, grpc-proto-v2, grpc-streaming, grpc-tls, grpc-tls-p12, grpc-test-random-port",
"os-name": "ubuntu-latest"
"os-name": "ubuntu-22.04"
},
{
"category": "Windows support",
Expand All @@ -142,13 +142,13 @@
"category": "DevTools Integration Tests",
"timeout": 75,
"test-modules": "devtools-registry-client",
"os-name": "ubuntu-latest"
"os-name": "ubuntu-22.04"
},
{
"category": "AWT, ImageIO and Java2D, Packaging .so files",
"timeout": 40,
"test-modules": "awt, no-awt, awt-packaging",
"os-name": "ubuntu-latest"
"os-name": "ubuntu-22.04"
}
]
}
6 changes: 3 additions & 3 deletions .github/virtual-threads-tests.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
"category": "Main",
"timeout": 50,
"test-modules": "virtual-threads-disabled, grpc-virtual-threads, mailer-virtual-threads, redis-virtual-threads, rest-client-reactive-virtual-threads, resteasy-reactive-virtual-threads, vertx-event-bus-virtual-threads, scheduler-virtual-threads, quartz-virtual-threads",
"os-name": "ubuntu-latest"
"os-name": "ubuntu-22.04"
},
{
"category": "Messaging",
"timeout": 45,
"test-modules": "amqp-virtual-threads, jms-virtual-threads, kafka-virtual-threads",
"os-name": "ubuntu-latest"
"os-name": "ubuntu-22.04"
},
{
"category": "Security",
"timeout": 20,
"test-modules": "security-webauthn-virtual-threads",
"os-name": "ubuntu-latest"
"os-name": "ubuntu-22.04"
}
]
}
28 changes: 14 additions & 14 deletions .github/workflows/ci-actions-incremental.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
# For more details, see
# https://github.community/t/pull-request-attribute-empty-in-workflow-run-event-object-for-pr-from-forked-repo/154682
attach-pr-number:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
name: Attach pull request number
if: github.event_name == 'pull_request'
steps:
Expand All @@ -84,15 +84,15 @@ jobs:
retention-days: 1
ci-sanity-check:
name: "CI Sanity Check"
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
# Skip main in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
steps:
- name: Build
run: sleep 30
build-jdk17:
name: "Initial JDK 17 Build"
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
# Skip main in forks
# Skip draft PRs, rerun as soon as its removed
if: "(github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')) && ( \
Expand Down Expand Up @@ -266,7 +266,7 @@ jobs:

calculate-test-jobs:
name: Calculate Test Jobs
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
# Skip main in forks
if: "github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main')"
needs: build-jdk17
Expand Down Expand Up @@ -490,7 +490,7 @@ jobs:
- {
name: "17",
java-version: 17,
os-name: "ubuntu-latest"
os-name: "ubuntu-22.04"
}
- {
name: "17 Windows",
Expand Down Expand Up @@ -597,7 +597,7 @@ jobs:
- {
name: "17",
java-version: 17,
os-name: "ubuntu-latest"
os-name: "ubuntu-22.04"
}
- {
name: "17 Windows",
Expand Down Expand Up @@ -684,12 +684,12 @@ jobs:
- {
name: "17",
java-version: 17,
os-name: "ubuntu-latest"
os-name: "ubuntu-22.04"
}
- {
name: "21",
java-version: 21,
os-name: "ubuntu-latest"
os-name: "ubuntu-22.04"
}
- {
name: "17 Windows",
Expand Down Expand Up @@ -780,12 +780,12 @@ jobs:
- {
name: "17",
java-version: 17,
os-name: "ubuntu-latest"
os-name: "ubuntu-22.04"
}
- {
name: "21",
java-version: 21,
os-name: "ubuntu-latest"
os-name: "ubuntu-22.04"
}
- {
name: "17 Windows",
Expand Down Expand Up @@ -876,7 +876,7 @@ jobs:
- {
name: "17",
java-version: 17,
os-name: "ubuntu-latest"
os-name: "ubuntu-22.04"
}
steps:
- name: Gradle Enterprise environment
Expand Down Expand Up @@ -1037,7 +1037,7 @@ jobs:
needs: [build-jdk17, calculate-test-jobs]
# Skip main in forks
if: "needs.calculate-test-jobs.outputs.run_tcks == 'true' && (github.repository == 'quarkusio/quarkus' || !endsWith(github.ref, '/main'))"
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
timeout-minutes: 150
steps:
- name: Gradle Enterprise environment
Expand Down Expand Up @@ -1249,7 +1249,7 @@ jobs:
if: ${{ always() && github.repository == 'quarkusio/quarkus' && endsWith(github.ref, '/main') && github.event_name != 'pull_request' && needs.native-tests.result != 'skipped' && needs.native-tests.result != 'cancelled' }}
needs:
- native-tests
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/download-artifact@v4
with:
Expand Down Expand Up @@ -1304,7 +1304,7 @@ jobs:
done

build-report:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
name: Build report
needs: [build-jdk17,jvm-tests,maven-tests,gradle-tests,devtools-tests,kubernetes-tests,quickstarts-tests,tcks-test,native-tests,virtual-thread-native-tests]
if: always()
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-istio.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
jobs:
cache:
name: Build and save artifacts
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
if: "github.repository == 'quarkusio/quarkus' || github.event_name == 'workflow_dispatch'"
steps:
- uses: actions/checkout@v4
Expand All @@ -35,7 +35,7 @@ jobs:
kubernetes:
name: Istio + Kubernetes Integration Tests
needs: cache
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
if: "github.repository == 'quarkusio/quarkus' || github.event_name == 'workflow_dispatch'"
strategy:
fail-fast: false
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci-kubernetes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
jobs:
cache:
name: Build and save artifacts
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
if: "github.repository == 'quarkusio/quarkus' || github.event_name == 'workflow_dispatch'"
steps:
- uses: actions/checkout@v4
Expand All @@ -35,7 +35,7 @@ jobs:
kubernetes:
name: Kubernetes Integration Tests
needs: cache
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
if: "github.repository == 'quarkusio/quarkus' || github.event_name == 'workflow_dispatch'"
strategy:
fail-fast: false
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
knative:
name: Knative Integration Tests
needs: cache
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
if: "github.repository == 'quarkusio/quarkus' || github.event_name == 'workflow_dispatch'"
strategy:
fail-fast: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-sanity-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ on:
jobs:
ci-sanity-check:
name: "CI Sanity Check"
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
if: github.repository == 'quarkusio/quarkus'
steps:
- name: Build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
if: github.repository == 'quarkusio/quarkus'

strategy:
Expand Down
Loading
Loading