From dfd656739e366070cd679ddfd76b36eac585894c Mon Sep 17 00:00:00 2001 From: ansgarz Date: Thu, 10 Mar 2022 21:24:17 +0100 Subject: [PATCH] release-0.9.12 --- build.gradle | 2 +- .../provs/server/infrastructure/k3s/ConfigRepository.kt | 2 +- .../provs/framework/ubuntu/git/base/GitKtTest.kt | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index bafdcad..f00824f 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ apply plugin: 'kotlinx-serialization' group = 'org.domaindrivenarchitecture.provs' -version = '0.9.12-SNAPSHOT' +version = 'release-0.9.12' repositories { mavenCentral() diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/k3s/ConfigRepository.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/k3s/ConfigRepository.kt index 7b18566..1382987 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/k3s/ConfigRepository.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/server/infrastructure/k3s/ConfigRepository.kt @@ -11,7 +11,7 @@ private const val DEFAULT_CONFIG_FILE = "server-config.yaml" fun getK3sConfig(fileName: ConfigFileName?): K3sConfig { val filename = fileName?.fileName ?: DEFAULT_CONFIG_FILE - return if (File(filename).exists()) { + return if (File(filename).exists() || (filename != DEFAULT_CONFIG_FILE)) { readFromFile(filename).yamlToType() } else { K3sConfig("localhost", Node("127.0.0.1"), apple = true) diff --git a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/git/base/GitKtTest.kt b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/git/base/GitKtTest.kt index a8f011f..be3f928 100644 --- a/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/git/base/GitKtTest.kt +++ b/src/test/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/git/base/GitKtTest.kt @@ -4,6 +4,7 @@ import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInsta import org.domaindrivenarchitecture.provs.framework.ubuntu.keys.base.isHostKnown import org.domaindrivenarchitecture.provs.test.defaultTestContainer import org.domaindrivenarchitecture.provs.test.tags.ContainerTest +import org.domaindrivenarchitecture.provs.test.tags.ExtensiveContainerTest import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Test @@ -30,7 +31,7 @@ internal class GitKtTest { } @Test - @ContainerTest + @ExtensiveContainerTest fun gitClone() { // given val prov = defaultTestContainer()