From a5e1f1870f0059c48a1a51137926ad08371433b2 Mon Sep 17 00:00:00 2001 From: willdavsmith Date: Wed, 26 Feb 2025 12:02:13 -0800 Subject: [PATCH 1/4] Skipping failing postgres test Signed-off-by: willdavsmith --- bicep-types | 2 +- .../corerp/noncloud/resources/recipe_terraform_test.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bicep-types b/bicep-types index b7606cb691..0143e0b634 160000 --- a/bicep-types +++ b/bicep-types @@ -1 +1 @@ -Subproject commit b7606cb691926f9499baab69d40d104cdc49e7ca +Subproject commit 0143e0b634b77515e681a57c5c5d594da8093825 diff --git a/test/functional-portable/corerp/noncloud/resources/recipe_terraform_test.go b/test/functional-portable/corerp/noncloud/resources/recipe_terraform_test.go index 20014e8e14..acdfe9e71f 100644 --- a/test/functional-portable/corerp/noncloud/resources/recipe_terraform_test.go +++ b/test/functional-portable/corerp/noncloud/resources/recipe_terraform_test.go @@ -140,6 +140,7 @@ func Test_TerraformRecipe_KubernetesRedis(t *testing.T) { // - Create an extender resource using a Terraform recipe that deploys Postgres on Kubernetes. // - The recipe deployment creates a Kubernetes deployment and a Kubernetes service and a postgres db. func Test_TerraformRecipe_KubernetesPostgres(t *testing.T) { + t.Skip("Skipping test due to failures: https://github.com/radius-project/radius/issues/8679") template := "testdata/corerp-resources-terraform-postgres.bicep" appName := "corerp-resources-terraform-pg-app" envName := "corerp-resources-terraform-pg-env" From 5d176de6544a6155088aab012dbaa78ddf4dc54f Mon Sep 17 00:00:00 2001 From: willdavsmith Date: Wed, 26 Feb 2025 12:04:14 -0800 Subject: [PATCH 2/4] bicep-types Signed-off-by: willdavsmith --- bicep-types | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bicep-types b/bicep-types index 0143e0b634..b7606cb691 160000 --- a/bicep-types +++ b/bicep-types @@ -1 +1 @@ -Subproject commit 0143e0b634b77515e681a57c5c5d594da8093825 +Subproject commit b7606cb691926f9499baab69d40d104cdc49e7ca From befed25bc2b9c6f1566846fcc1a99df4a5374923 Mon Sep 17 00:00:00 2001 From: willdavsmith Date: Fri, 28 Feb 2025 15:39:06 -0800 Subject: [PATCH 3/4] Various LRT fixes Signed-off-by: willdavsmith --- .github/scripts/cleanup-long-running-cluster.sh | 13 ++++++++----- .github/workflows/long-running-azure.yaml | 7 +++++-- test/infra/azure/main.bicep | 2 +- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.github/scripts/cleanup-long-running-cluster.sh b/.github/scripts/cleanup-long-running-cluster.sh index e9d9e79e83..e3f80b2190 100755 --- a/.github/scripts/cleanup-long-running-cluster.sh +++ b/.github/scripts/cleanup-long-running-cluster.sh @@ -49,13 +49,16 @@ fi # Delete all test namespaces. echo "delete all test namespaces" -namespaces=$(kubectl get namespace | - grep -E '^kubernetes-interop-tutorial.*|^corerp.*|^test.*|^default-.*|^radiusfunctionaltestbucket.*|^radius-test.*|^kubernetes-cli.*|^dpsb-.*|^dsrp-.*|^azstorage-workload.*|^dapr-serviceinvocation|^daprrp-rs-.*|^dapr-sts-.*|^mynamespace.*|^demo.*|^tutorial-demo.*|^ms.+' | - awk '{print $1}') +namespace_whitelist=("cert-manager" "dapr-system" "default" "gatekeeper-system" "kube-node-lease" "kube-public" "kube-system" "radius-system") +namespaces=$(kubectl get namespaces --no-headers -o custom-columns=":metadata.name") for ns in $namespaces; do if [ -z "$ns" ]; then break fi - echo "deleting namespaces: $ns" - kubectl delete namespace $ns --ignore-not-found=true + if [[ " ${namespace_whitelist[@]} " =~ " ${ns} " ]]; then + echo "skip deletion: $ns" + else + echo "deleting namespaces: $ns" + kubectl delete namespace $ns --ignore-not-found=true + fi done diff --git a/.github/workflows/long-running-azure.yaml b/.github/workflows/long-running-azure.yaml index 21cf3d96b6..57cbc96519 100644 --- a/.github/workflows/long-running-azure.yaml +++ b/.github/workflows/long-running-azure.yaml @@ -48,10 +48,13 @@ on: workflow_dispatch: inputs: skip-build: - description: 'Skip build (true/false)' + description: 'Skip build (true/false). Setting to false will cause the tests to run with the latest changes from the main branch.' required: false default: 'true' - type: string + type: choice + options: + - 'true' + - 'false' schedule: # Run every 2 hours - cron: "0 */2 * * *" diff --git a/test/infra/azure/main.bicep b/test/infra/azure/main.bicep index 963ffcad72..4703d0897e 100644 --- a/test/infra/azure/main.bicep +++ b/test/infra/azure/main.bicep @@ -90,7 +90,7 @@ module aksCluster './modules/akscluster.bicep' = { params: { name: aksClusterName location: location - kubernetesVersion: '1.28.5' + kubernetesVersion: '1.31.5' logAnalyticsWorkspaceId: logAnalyticsWorkspace.outputs.id systemAgentPoolName: 'agentpool' systemAgentPoolVmSize: 'Standard_D4as_v5' From 066a53013b02be2d47d49f41828a43247b535396 Mon Sep 17 00:00:00 2001 From: willdavsmith Date: Fri, 28 Feb 2025 16:13:42 -0800 Subject: [PATCH 4/4] Fix issue Signed-off-by: willdavsmith --- .../corerp/noncloud/resources/recipe_terraform_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/test/functional-portable/corerp/noncloud/resources/recipe_terraform_test.go b/test/functional-portable/corerp/noncloud/resources/recipe_terraform_test.go index acdfe9e71f..20014e8e14 100644 --- a/test/functional-portable/corerp/noncloud/resources/recipe_terraform_test.go +++ b/test/functional-portable/corerp/noncloud/resources/recipe_terraform_test.go @@ -140,7 +140,6 @@ func Test_TerraformRecipe_KubernetesRedis(t *testing.T) { // - Create an extender resource using a Terraform recipe that deploys Postgres on Kubernetes. // - The recipe deployment creates a Kubernetes deployment and a Kubernetes service and a postgres db. func Test_TerraformRecipe_KubernetesPostgres(t *testing.T) { - t.Skip("Skipping test due to failures: https://github.com/radius-project/radius/issues/8679") template := "testdata/corerp-resources-terraform-postgres.bicep" appName := "corerp-resources-terraform-pg-app" envName := "corerp-resources-terraform-pg-env"