From b89ba4d739ab6cdbe2bdec64c0b96758cfe2ad47 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Thu, 22 Jun 2023 17:03:23 +0200 Subject: [PATCH] tooling: updating the teamcity configuration --- .teamcity/components/build_azure.kt | 2 +- .teamcity/components/build_components.kt | 8 ++++---- .teamcity/components/build_config_pull_request.kt | 2 +- .teamcity/components/build_config_service.kt | 2 +- .teamcity/components/project.kt | 4 ++-- .teamcity/components/vcs_root.kt | 2 +- .teamcity/pom.xml | 11 ++++++----- .teamcity/settings.kts | 4 ++-- 8 files changed, 18 insertions(+), 17 deletions(-) diff --git a/.teamcity/components/build_azure.kt b/.teamcity/components/build_azure.kt index 17b98b0ed..8a1d70a83 100644 --- a/.teamcity/components/build_azure.kt +++ b/.teamcity/components/build_azure.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: MPL-2.0 */ -import jetbrains.buildServer.configs.kotlin.v2019_2.ParametrizedWithType +import jetbrains.buildServer.configs.kotlin.ParametrizedWithType class ClientConfiguration(var clientId: String, var clientSecret: String, diff --git a/.teamcity/components/build_components.kt b/.teamcity/components/build_components.kt index 9b7f06f98..b16de6d5b 100644 --- a/.teamcity/components/build_components.kt +++ b/.teamcity/components/build_components.kt @@ -3,10 +3,10 @@ * SPDX-License-Identifier: MPL-2.0 */ -import jetbrains.buildServer.configs.kotlin.v2019_2.* -import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.GolangFeature -import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.ScriptBuildStep -import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.schedule +import jetbrains.buildServer.configs.kotlin.* +import jetbrains.buildServer.configs.kotlin.buildFeatures.GolangFeature +import jetbrains.buildServer.configs.kotlin.buildSteps.ScriptBuildStep +import jetbrains.buildServer.configs.kotlin.triggers.schedule // NOTE: in time this could be pulled out into a separate Kotlin package diff --git a/.teamcity/components/build_config_pull_request.kt b/.teamcity/components/build_config_pull_request.kt index 0ae11ed08..952d181e5 100644 --- a/.teamcity/components/build_config_pull_request.kt +++ b/.teamcity/components/build_config_pull_request.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: MPL-2.0 */ -import jetbrains.buildServer.configs.kotlin.v2019_2.* +import jetbrains.buildServer.configs.kotlin.* class pullRequest(displayName: String, environment: String) { val displayName = displayName diff --git a/.teamcity/components/build_config_service.kt b/.teamcity/components/build_config_service.kt index 92f51fbd7..e5e2f4835 100644 --- a/.teamcity/components/build_config_service.kt +++ b/.teamcity/components/build_config_service.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: MPL-2.0 */ -import jetbrains.buildServer.configs.kotlin.v2019_2.* +import jetbrains.buildServer.configs.kotlin.* class serviceDetails(name: String, displayName: String, environment: String) { val packageName = name diff --git a/.teamcity/components/project.kt b/.teamcity/components/project.kt index 184ab7190..357ddb42c 100644 --- a/.teamcity/components/project.kt +++ b/.teamcity/components/project.kt @@ -3,8 +3,8 @@ * SPDX-License-Identifier: MPL-2.0 */ -import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType -import jetbrains.buildServer.configs.kotlin.v2019_2.Project +import jetbrains.buildServer.configs.kotlin.BuildType +import jetbrains.buildServer.configs.kotlin.Project const val providerName = "azurestack" diff --git a/.teamcity/components/vcs_root.kt b/.teamcity/components/vcs_root.kt index a596fc11a..36fb999c6 100644 --- a/.teamcity/components/vcs_root.kt +++ b/.teamcity/components/vcs_root.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: MPL-2.0 */ -import jetbrains.buildServer.configs.kotlin.v2019_2.vcs.GitVcsRoot +import jetbrains.buildServer.configs.kotlin.vcs.GitVcsRoot object providerRepository : GitVcsRoot({ name = "terraform-provider-azurestack" diff --git a/.teamcity/pom.xml b/.teamcity/pom.xml index 1a7532ee3..7143ec004 100644 --- a/.teamcity/pom.xml +++ b/.teamcity/pom.xml @@ -6,9 +6,10 @@ 4.0.0 - TeamCity Config DSL Script - Configuration-As-Code - Configuration-As-Code + + Terraform-Provider-AzureStack Config DSL Script + TerraformProviderAzureStack + TerraformProviderAzureStack 1.0-SNAPSHOT @@ -105,13 +106,13 @@ org.jetbrains.teamcity - configs-dsl-kotlin + configs-dsl-kotlin-latest ${teamcity.dsl.version} compile org.jetbrains.teamcity - configs-dsl-kotlin-plugins + configs-dsl-kotlin-plugins-latest 1.0-SNAPSHOT pom compile diff --git a/.teamcity/settings.kts b/.teamcity/settings.kts index df7252a42..5b49c8bc2 100644 --- a/.teamcity/settings.kts +++ b/.teamcity/settings.kts @@ -5,9 +5,9 @@ import AzureStack import ClientConfiguration -import jetbrains.buildServer.configs.kotlin.v2019_2.* +import jetbrains.buildServer.configs.kotlin.* -version = "2020.2" +version = "2023.05" var clientId = DslContext.getParameter("clientId", "") var clientSecret = DslContext.getParameter("clientSecret", "")