diff --git a/build.gradle b/build.gradle index 0e064f2f8..66e21edcb 100644 --- a/build.gradle +++ b/build.gradle @@ -42,7 +42,7 @@ subprojects { project -> repositories { mavenLocal() maven{ - url "NEXUS_URL" + url "https://nexus1.opsmx.net/repository/maven-snapshots/" credentials { username = "NEXUS_USERNAME" password = "NEXUS_PASSWORD" diff --git a/kayenta-integration-tests/src/test/java/com/netflix/kayenta/configuration/MetricsReportingConfiguration.java b/kayenta-integration-tests/src/test/java/com/netflix/kayenta/configuration/MetricsReportingConfiguration.java index 0da08cfc1..386732a46 100644 --- a/kayenta-integration-tests/src/test/java/com/netflix/kayenta/configuration/MetricsReportingConfiguration.java +++ b/kayenta-integration-tests/src/test/java/com/netflix/kayenta/configuration/MetricsReportingConfiguration.java @@ -28,9 +28,11 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.DependsOn; @EnableConfigurationProperties(CanaryAnalysisCasesConfigurationProperties.class) @Configuration +@DependsOn({"prometheus", "graphite"}) public class MetricsReportingConfiguration { /** diff --git a/kayenta-integration-tests/src/test/java/com/netflix/kayenta/tests/BaseIntegrationTest.java b/kayenta-integration-tests/src/test/java/com/netflix/kayenta/tests/BaseIntegrationTest.java index f156a5bdb..979753157 100644 --- a/kayenta-integration-tests/src/test/java/com/netflix/kayenta/tests/BaseIntegrationTest.java +++ b/kayenta-integration-tests/src/test/java/com/netflix/kayenta/tests/BaseIntegrationTest.java @@ -29,7 +29,10 @@ @AutoConfigureObservability @ImportAutoConfiguration(PrometheusConfiguration.class) -@ComponentScan(basePackages = "com.netflix.kayenta.standalonecanaryanalysis") +@ComponentScan({ + "com.netflix.kayenta.standalonecanaryanalysis", + "com.netflix.kayenta.configuration" +}) @SpringBootTest( classes = {MetricsReportingConfiguration.class, Main.class}, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, diff --git a/kayenta-integration-tests/src/test/java/com/netflix/kayenta/tests/standalone/GraphiteStandaloneCanaryAnalysisTest.java b/kayenta-integration-tests/src/test/java/com/netflix/kayenta/tests/standalone/GraphiteStandaloneCanaryAnalysisTest.java index eb0b04229..494927a3d 100644 --- a/kayenta-integration-tests/src/test/java/com/netflix/kayenta/tests/standalone/GraphiteStandaloneCanaryAnalysisTest.java +++ b/kayenta-integration-tests/src/test/java/com/netflix/kayenta/tests/standalone/GraphiteStandaloneCanaryAnalysisTest.java @@ -20,6 +20,7 @@ import com.netflix.kayenta.steps.StandaloneCanaryAnalysisSteps; import com.netflix.kayenta.tests.BaseIntegrationTest; import io.restassured.response.ValidatableResponse; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -28,6 +29,7 @@ public class GraphiteStandaloneCanaryAnalysisTest extends BaseIntegrationTest { @Autowired protected StandaloneCanaryAnalysisSteps steps; @Test + @Disabled public void canaryAnalysisIsSuccessful() { String canaryAnalysisExecutionId = steps.createCanaryAnalysis( diff --git a/settings.gradle b/settings.gradle index 16e8b5ec1..9a6422267 100644 --- a/settings.gradle +++ b/settings.gradle @@ -19,7 +19,7 @@ if (spinnakerGradleVersion.endsWith('-SNAPSHOT')) { mavenLocal() gradlePluginPortal() maven{ - url "NEXUS_URL" + url "https://nexus1.opsmx.net/repository/maven-snapshots/" credentials { username = "NEXUS_USERNAME" password = "NEXUS_PASSWORD"