From b91c5f86c6c4a3befd74219835e35a5e97466b4d Mon Sep 17 00:00:00 2001 From: Guillaume Allee Date: Fri, 8 Sep 2023 15:28:09 +0200 Subject: [PATCH 1/2] Add a variable for the upgrade test (which were using deprecated versions) --- ovh/provider_test.go | 1 + ovh/resource_cloud_project_kube_test.go | 4 ++-- website/docs/index.html.markdown | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ovh/provider_test.go b/ovh/provider_test.go index 1a60a2f88..4b8889006 100644 --- a/ovh/provider_test.go +++ b/ovh/provider_test.go @@ -234,6 +234,7 @@ func testAccPreCheckKubernetes(t *testing.T) { testAccPreCheckCloud(t) checkEnvOrSkip(t, "OVH_CLOUD_PROJECT_KUBE_REGION_TEST") checkEnvOrSkip(t, "OVH_CLOUD_PROJECT_KUBE_VERSION_TEST") + checkEnvOrSkip(t, "OVH_CLOUD_PROJECT_KUBE_PREV_VERSION_TEST") } // Checks that the environment variables needed for the /vrack/{service}/cloudProject acceptance tests diff --git a/ovh/resource_cloud_project_kube_test.go b/ovh/resource_cloud_project_kube_test.go index 351699d4a..767f8268e 100644 --- a/ovh/resource_cloud_project_kube_test.go +++ b/ovh/resource_cloud_project_kube_test.go @@ -1166,8 +1166,8 @@ func TestAccCloudProjectKubeUpdateVersion_basic(t *testing.T) { name := acctest.RandomWithPrefix(test_prefix) updatedName := acctest.RandomWithPrefix(test_prefix) - version1 := "1.24" - version2 := "1.25" + version1 := os.Getenv("OVH_CLOUD_PROJECT_KUBE_VERSION_TEST") + version2 := os.Getenv("OVH_CLOUD_PROJECT_KUBE_PREV_VERSION_TEST") config := fmt.Sprintf( testAccCloudProjectKubeConfig, diff --git a/website/docs/index.html.markdown b/website/docs/index.html.markdown index bd019e324..95335127a 100644 --- a/website/docs/index.html.markdown +++ b/website/docs/index.html.markdown @@ -145,6 +145,7 @@ variables must also be set: * `OVH_CLOUD_PROJECT_KUBE_REGION_TEST` - The region of your public cloud kubernetes project. * `OVH_CLOUD_PROJECT_KUBE_VERSION_TEST` - The version of your public cloud kubernetes project. +* `OVH_CLOUD_PROJECT_KUBE_PREV_VERSION_TEST` - The previous version of your public cloud kubernetes project. This is used to test upgrade. * `OVH_DEDICATED_SERVER` - The name of the dedicated server to test dedicated_server_networking resource. From 499a0e235a8742c02e0c5355182a48f790c12e06 Mon Sep 17 00:00:00 2001 From: Guillaume Allee Date: Fri, 8 Sep 2023 15:55:59 +0200 Subject: [PATCH 2/2] fix: switch the PREV & ACTUAL version --- ovh/resource_cloud_project_kube_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ovh/resource_cloud_project_kube_test.go b/ovh/resource_cloud_project_kube_test.go index 767f8268e..f83c25b70 100644 --- a/ovh/resource_cloud_project_kube_test.go +++ b/ovh/resource_cloud_project_kube_test.go @@ -1166,8 +1166,8 @@ func TestAccCloudProjectKubeUpdateVersion_basic(t *testing.T) { name := acctest.RandomWithPrefix(test_prefix) updatedName := acctest.RandomWithPrefix(test_prefix) - version1 := os.Getenv("OVH_CLOUD_PROJECT_KUBE_VERSION_TEST") - version2 := os.Getenv("OVH_CLOUD_PROJECT_KUBE_PREV_VERSION_TEST") + version1 := os.Getenv("OVH_CLOUD_PROJECT_KUBE_PREV_VERSION_TEST") + version2 := os.Getenv("OVH_CLOUD_PROJECT_KUBE_VERSION_TEST") config := fmt.Sprintf( testAccCloudProjectKubeConfig,