fix(queue/sql): fix clash between orca/keiko changelogs (#3140)

spinnaker · Sep 11, 2019 · 154daba · 154daba
1 parent 855eacd
commit 154daba
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/gradle.properties b/gradle.properties
@@ -4,4 +4,4 @@ enablePublishing=false
 korkVersion=6.7.1
 spinnakerGradleVersion=7.0.1
 org.gradle.parallel=true
-keikoVersion=2.13.0
+keikoVersion=2.13.1
diff --git a/orca-sql/src/main/kotlin/com/netflix/spinnaker/orca/sql/SpringLiquibaseProxy.kt b/orca-sql/src/main/kotlin/com/netflix/spinnaker/orca/sql/SpringLiquibaseProxy.kt
@@ -49,6 +49,12 @@ class SpringLiquibaseProxy(
     // First do the OSS migrations
     super.afterPropertiesSet()
 
+    SpringLiquibase().apply {
+      changeLog = "classpath:db/changelog-keiko.yml"
+      dataSource = createDataSource()
+      resourceLoader = this@SpringLiquibaseProxy.resourceLoader
+    }.afterPropertiesSet()
+
     // Then if anything else has been defined, do that afterwards
     sqlProperties.migration.additionalChangeLogs
       .filter { !it.isEmpty() }