From 2921c87349f3a72e3566922c0f1393584ea94586 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Mon, 12 Aug 2024 11:53:23 +0200 Subject: [PATCH] Revert "Disable Cloud smoke tests with Boot 3.4" This reverts commit 2c2651a1697af9e77d71f476bc05505ff111a9a2. See gh-234 --- .github/workflows/3.4.x-cloud-cloud-config-client.yml | 2 ++ .github/workflows/3.4.x-cloud-cloud-config-server.yml | 2 ++ .github/workflows/3.4.x-cloud-cloud-discovery-consul.yml | 2 ++ .github/workflows/3.4.x-cloud-cloud-discovery-eureka.yml | 2 ++ .github/workflows/3.4.x-cloud-cloud-discovery-zookeeper.yml | 2 ++ .github/workflows/3.4.x-cloud-cloud-function-web.yml | 2 ++ .github/workflows/3.4.x-cloud-cloud-function-webflux.yml | 2 ++ .github/workflows/3.4.x-cloud-cloud-gateway.yml | 2 ++ .github/workflows/3.4.x-cloud-cloud-loadbalancing-web.yml | 2 ++ .../workflows/3.4.x-cloud-cloud-loadbalancing-webflux.yml | 2 ++ .github/workflows/3.4.x-cloud-cloud-openfeign.yml | 2 ++ .../workflows/3.4.x-cloud-cloud-stream-kafka-streams.yml | 2 ++ .github/workflows/3.4.x-cloud-cloud-stream-kafka.yml | 2 ++ .github/workflows/3.4.x-cloud-cloud-stream-pulsar.yml | 2 ++ .github/workflows/3.4.x-cloud-cloud-stream-rabbit.yml | 2 ++ .github/workflows/3.4.x-cloud-cloud-task.yml | 2 ++ .../aot/gradle/GenerateGitHubActionsWorkflows.java | 6 ++---- 17 files changed, 34 insertions(+), 4 deletions(-) diff --git a/.github/workflows/3.4.x-cloud-cloud-config-client.yml b/.github/workflows/3.4.x-cloud-cloud-config-client.yml index 695a4d8b..033f0ccd 100644 --- a/.github/workflows/3.4.x-cloud-cloud-config-client.yml +++ b/.github/workflows/3.4.x-cloud-cloud-config-client.yml @@ -1,5 +1,7 @@ name: 3.4.x | Cloud Smoke Tests | Cloud Config Client on: + schedule: + - cron : '50 0 * * *' workflow_dispatch: jobs: cloud_config_client_app_test: diff --git a/.github/workflows/3.4.x-cloud-cloud-config-server.yml b/.github/workflows/3.4.x-cloud-cloud-config-server.yml index 961f128e..0efe469a 100644 --- a/.github/workflows/3.4.x-cloud-cloud-config-server.yml +++ b/.github/workflows/3.4.x-cloud-cloud-config-server.yml @@ -1,5 +1,7 @@ name: 3.4.x | Cloud Smoke Tests | Cloud Config Server on: + schedule: + - cron : '50 0 * * *' workflow_dispatch: jobs: cloud_config_server_app_test: diff --git a/.github/workflows/3.4.x-cloud-cloud-discovery-consul.yml b/.github/workflows/3.4.x-cloud-cloud-discovery-consul.yml index 66fe6868..92a0bb57 100644 --- a/.github/workflows/3.4.x-cloud-cloud-discovery-consul.yml +++ b/.github/workflows/3.4.x-cloud-cloud-discovery-consul.yml @@ -1,5 +1,7 @@ name: 3.4.x | Cloud Smoke Tests | Cloud Discovery Consul on: + schedule: + - cron : '50 0 * * *' workflow_dispatch: jobs: cloud_discovery_consul_app_test: diff --git a/.github/workflows/3.4.x-cloud-cloud-discovery-eureka.yml b/.github/workflows/3.4.x-cloud-cloud-discovery-eureka.yml index b96984ba..b9efc547 100644 --- a/.github/workflows/3.4.x-cloud-cloud-discovery-eureka.yml +++ b/.github/workflows/3.4.x-cloud-cloud-discovery-eureka.yml @@ -1,5 +1,7 @@ name: 3.4.x | Cloud Smoke Tests | Cloud Discovery Eureka on: + schedule: + - cron : '50 0 * * *' workflow_dispatch: jobs: cloud_discovery_eureka_app_test: diff --git a/.github/workflows/3.4.x-cloud-cloud-discovery-zookeeper.yml b/.github/workflows/3.4.x-cloud-cloud-discovery-zookeeper.yml index d287b328..95099876 100644 --- a/.github/workflows/3.4.x-cloud-cloud-discovery-zookeeper.yml +++ b/.github/workflows/3.4.x-cloud-cloud-discovery-zookeeper.yml @@ -1,5 +1,7 @@ name: 3.4.x | Cloud Smoke Tests | Cloud Discovery Zookeeper on: + schedule: + - cron : '50 0 * * *' workflow_dispatch: jobs: cloud_discovery_zookeeper_app_test: diff --git a/.github/workflows/3.4.x-cloud-cloud-function-web.yml b/.github/workflows/3.4.x-cloud-cloud-function-web.yml index deb13ec0..2c359af7 100644 --- a/.github/workflows/3.4.x-cloud-cloud-function-web.yml +++ b/.github/workflows/3.4.x-cloud-cloud-function-web.yml @@ -1,5 +1,7 @@ name: 3.4.x | Cloud Smoke Tests | Cloud Function Web on: + schedule: + - cron : '50 0 * * *' workflow_dispatch: jobs: cloud_function_web_app_test: diff --git a/.github/workflows/3.4.x-cloud-cloud-function-webflux.yml b/.github/workflows/3.4.x-cloud-cloud-function-webflux.yml index 456f68fa..16b64db8 100644 --- a/.github/workflows/3.4.x-cloud-cloud-function-webflux.yml +++ b/.github/workflows/3.4.x-cloud-cloud-function-webflux.yml @@ -1,5 +1,7 @@ name: 3.4.x | Cloud Smoke Tests | Cloud Function Webflux on: + schedule: + - cron : '50 0 * * *' workflow_dispatch: jobs: cloud_function_webflux_app_test: diff --git a/.github/workflows/3.4.x-cloud-cloud-gateway.yml b/.github/workflows/3.4.x-cloud-cloud-gateway.yml index 3c9f7e8b..1cd29122 100644 --- a/.github/workflows/3.4.x-cloud-cloud-gateway.yml +++ b/.github/workflows/3.4.x-cloud-cloud-gateway.yml @@ -1,5 +1,7 @@ name: 3.4.x | Cloud Smoke Tests | Cloud Gateway on: + schedule: + - cron : '50 0 * * *' workflow_dispatch: jobs: cloud_gateway_app_test: diff --git a/.github/workflows/3.4.x-cloud-cloud-loadbalancing-web.yml b/.github/workflows/3.4.x-cloud-cloud-loadbalancing-web.yml index 60059412..9cf447b7 100644 --- a/.github/workflows/3.4.x-cloud-cloud-loadbalancing-web.yml +++ b/.github/workflows/3.4.x-cloud-cloud-loadbalancing-web.yml @@ -1,5 +1,7 @@ name: 3.4.x | Cloud Smoke Tests | Cloud Loadbalancing Web on: + schedule: + - cron : '50 0 * * *' workflow_dispatch: jobs: cloud_loadbalancing_web_app_test: diff --git a/.github/workflows/3.4.x-cloud-cloud-loadbalancing-webflux.yml b/.github/workflows/3.4.x-cloud-cloud-loadbalancing-webflux.yml index 0a398a2f..7d79d042 100644 --- a/.github/workflows/3.4.x-cloud-cloud-loadbalancing-webflux.yml +++ b/.github/workflows/3.4.x-cloud-cloud-loadbalancing-webflux.yml @@ -1,5 +1,7 @@ name: 3.4.x | Cloud Smoke Tests | Cloud Loadbalancing Webflux on: + schedule: + - cron : '50 0 * * *' workflow_dispatch: jobs: cloud_loadbalancing_webflux_app_test: diff --git a/.github/workflows/3.4.x-cloud-cloud-openfeign.yml b/.github/workflows/3.4.x-cloud-cloud-openfeign.yml index 5de3a14f..01fb7f02 100644 --- a/.github/workflows/3.4.x-cloud-cloud-openfeign.yml +++ b/.github/workflows/3.4.x-cloud-cloud-openfeign.yml @@ -1,5 +1,7 @@ name: 3.4.x | Cloud Smoke Tests | Cloud Openfeign on: + schedule: + - cron : '50 0 * * *' workflow_dispatch: jobs: cloud_openfeign_app_test: diff --git a/.github/workflows/3.4.x-cloud-cloud-stream-kafka-streams.yml b/.github/workflows/3.4.x-cloud-cloud-stream-kafka-streams.yml index 81b2511c..7e1a924b 100644 --- a/.github/workflows/3.4.x-cloud-cloud-stream-kafka-streams.yml +++ b/.github/workflows/3.4.x-cloud-cloud-stream-kafka-streams.yml @@ -1,5 +1,7 @@ name: 3.4.x | Cloud Smoke Tests | Cloud Stream Kafka Streams on: + schedule: + - cron : '50 0 * * *' workflow_dispatch: jobs: cloud_stream_kafka_streams_app_test: diff --git a/.github/workflows/3.4.x-cloud-cloud-stream-kafka.yml b/.github/workflows/3.4.x-cloud-cloud-stream-kafka.yml index 64584c27..53e0fbd6 100644 --- a/.github/workflows/3.4.x-cloud-cloud-stream-kafka.yml +++ b/.github/workflows/3.4.x-cloud-cloud-stream-kafka.yml @@ -1,5 +1,7 @@ name: 3.4.x | Cloud Smoke Tests | Cloud Stream Kafka on: + schedule: + - cron : '50 0 * * *' workflow_dispatch: jobs: cloud_stream_kafka_app_test: diff --git a/.github/workflows/3.4.x-cloud-cloud-stream-pulsar.yml b/.github/workflows/3.4.x-cloud-cloud-stream-pulsar.yml index e7469c1d..0681e515 100644 --- a/.github/workflows/3.4.x-cloud-cloud-stream-pulsar.yml +++ b/.github/workflows/3.4.x-cloud-cloud-stream-pulsar.yml @@ -1,5 +1,7 @@ name: 3.4.x | Cloud Smoke Tests | Cloud Stream Pulsar on: + schedule: + - cron : '50 0 * * *' workflow_dispatch: jobs: cloud_stream_pulsar_app_test: diff --git a/.github/workflows/3.4.x-cloud-cloud-stream-rabbit.yml b/.github/workflows/3.4.x-cloud-cloud-stream-rabbit.yml index 84374826..d7e92af6 100644 --- a/.github/workflows/3.4.x-cloud-cloud-stream-rabbit.yml +++ b/.github/workflows/3.4.x-cloud-cloud-stream-rabbit.yml @@ -1,5 +1,7 @@ name: 3.4.x | Cloud Smoke Tests | Cloud Stream Rabbit on: + schedule: + - cron : '50 0 * * *' workflow_dispatch: jobs: cloud_stream_rabbit_app_test: diff --git a/.github/workflows/3.4.x-cloud-cloud-task.yml b/.github/workflows/3.4.x-cloud-cloud-task.yml index 1494fa40..0b01e2cb 100644 --- a/.github/workflows/3.4.x-cloud-cloud-task.yml +++ b/.github/workflows/3.4.x-cloud-cloud-task.yml @@ -1,5 +1,7 @@ name: 3.4.x | Cloud Smoke Tests | Cloud Task on: + schedule: + - cron : '50 0 * * *' workflow_dispatch: jobs: cloud_task_app_test: diff --git a/gradle/plugins/aot-smoke-test-ci-plugin/src/main/java/org/springframework/aot/gradle/GenerateGitHubActionsWorkflows.java b/gradle/plugins/aot-smoke-test-ci-plugin/src/main/java/org/springframework/aot/gradle/GenerateGitHubActionsWorkflows.java index 69d675cb..3d7abe21 100644 --- a/gradle/plugins/aot-smoke-test-ci-plugin/src/main/java/org/springframework/aot/gradle/GenerateGitHubActionsWorkflows.java +++ b/gradle/plugins/aot-smoke-test-ci-plugin/src/main/java/org/springframework/aot/gradle/GenerateGitHubActionsWorkflows.java @@ -78,10 +78,8 @@ void generateWorkflow(SmokeTest smokeTest) { try (PrintWriter writer = new PrintWriter(new FileWriter(workflowFile))) { writer.println("name: " + workflowName); writer.println("on:"); - if (!"cloud".equals(smokeTest.group()) || !springBootGeneration.equals("3.4.x")) { - writer.println(" schedule:"); - writer.println(" - cron : '" + getCronSchedule().get() + "'"); - } + writer.println(" schedule:"); + writer.println(" - cron : '" + getCronSchedule().get() + "'"); writer.println(" workflow_dispatch:"); writer.println("jobs:"); smokeTest.tests().forEach((test) -> {