Merge pull request #215 from hashicorp/f/updating-teamcity

tooling: updating the teamcity configuration
hashicorp · Jun 22, 2023 · 1b1663b · 1b1663b
2 parents 44cc8c9 + b89ba4d
commit 1b1663b
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 17 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -6,9 +6,10 @@
 
 <project>
   <modelVersion>4.0.0</modelVersion>
-  <name>TeamCity Config DSL Script</name>
-  <groupId>Configuration-As-Code</groupId>
-  <artifactId>Configuration-As-Code</artifactId>
+
+  <name>Terraform-Provider-AzureStack Config DSL Script</name>
+  <groupId>TerraformProviderAzureStack</groupId>
+  <artifactId>TerraformProviderAzureStack</artifactId>
   <version>1.0-SNAPSHOT</version>
 
   <parent>
@@ -105,13 +106,13 @@
   <dependencies>
     <dependency>
       <groupId>org.jetbrains.teamcity</groupId>
-      <artifactId>configs-dsl-kotlin</artifactId>
+      <artifactId>configs-dsl-kotlin-latest</artifactId>
       <version>${teamcity.dsl.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.jetbrains.teamcity</groupId>
-      <artifactId>configs-dsl-kotlin-plugins</artifactId>
+      <artifactId>configs-dsl-kotlin-plugins-latest</artifactId>
       <version>1.0-SNAPSHOT</version>
       <type>pom</type>
       <scope>compile</scope>

diff --git 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", "")