From ac47d8865b75e08bf31543013159d0f4a78b8176 Mon Sep 17 00:00:00 2001 From: Sruti Parthiban Date: Tue, 2 Nov 2021 13:33:39 -0700 Subject: [PATCH] Add DCO workflow and fix failing IT Signed-off-by: Sruti Parthiban --- .github/workflows/dco.yml | 18 +++++++++++++++++ ...anceanalyzer-rca-1.2.0.0-SNAPSHOT.jar.sha1 | 2 +- .../ConfigOverridesIT.java | 20 +++++++++++-------- 3 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 .github/workflows/dco.yml diff --git a/.github/workflows/dco.yml b/.github/workflows/dco.yml new file mode 100644 index 00000000..cf30ea89 --- /dev/null +++ b/.github/workflows/dco.yml @@ -0,0 +1,18 @@ +name: Developer Certificate of Origin Check + +on: [pull_request] + +jobs: + check: + runs-on: ubuntu-latest + + steps: + - name: Get PR Commits + id: 'get-pr-commits' + uses: tim-actions/get-pr-commits@v1.1.0 + with: + token: ${{ secrets.GITHUB_TOKEN }} + - name: DCO Check + uses: tim-actions/dco@v1.1.0 + with: + commits: ${{ steps.get-pr-commits.outputs.commits }} diff --git a/licenses/performanceanalyzer-rca-1.2.0.0-SNAPSHOT.jar.sha1 b/licenses/performanceanalyzer-rca-1.2.0.0-SNAPSHOT.jar.sha1 index 983525fb..c51a9e31 100644 --- a/licenses/performanceanalyzer-rca-1.2.0.0-SNAPSHOT.jar.sha1 +++ b/licenses/performanceanalyzer-rca-1.2.0.0-SNAPSHOT.jar.sha1 @@ -1 +1 @@ -7bc66e87081fe6991129463a019d4c118996841c +7bc66e87081fe6991129463a019d4c118996841c \ No newline at end of file diff --git a/src/test/java/org/opensearch/performanceanalyzer/ConfigOverridesIT.java b/src/test/java/org/opensearch/performanceanalyzer/ConfigOverridesIT.java index e134f97f..731108d2 100644 --- a/src/test/java/org/opensearch/performanceanalyzer/ConfigOverridesIT.java +++ b/src/test/java/org/opensearch/performanceanalyzer/ConfigOverridesIT.java @@ -58,16 +58,18 @@ public class ConfigOverridesIT extends PerformanceAnalyzerIntegTestBase { @Test public void testSimpleOverride() throws Exception { - testSimpleOverride(CONFIG_OVERRIDES_ENDPOINT); + testSimpleOverride(RestConfig.PA_BASE_URI, CONFIG_OVERRIDES_ENDPOINT); } @Test public void testLegacySimpleOverride() throws Exception { - testSimpleOverride(LEGACY_OPENDISTRO_CONFIG_OVERRIDES_ENDPOINT); + testSimpleOverride( + RestConfig.LEGACY_PA_BASE_URI, LEGACY_OPENDISTRO_CONFIG_OVERRIDES_ENDPOINT); } - public void testSimpleOverride(String configOverridesEndpoint) throws Exception { - ensurePaAndRcaEnabled(configOverridesEndpoint); + public void testSimpleOverride(String paBaseUri, String configOverridesEndpoint) + throws Exception { + ensurePaAndRcaEnabled(paBaseUri); final ConfigOverrides overrides = getOverrides( Arrays.asList(HOT_SHARD_RCA, HOT_NODE_CLUSTER_RCA), @@ -106,16 +108,18 @@ public void testSimpleOverride(String configOverridesEndpoint) throws Exception @Test public void testCompositeOverrides() throws Exception { - testCompositeOverrides(CONFIG_OVERRIDES_ENDPOINT); + testCompositeOverrides(RestConfig.PA_BASE_URI, CONFIG_OVERRIDES_ENDPOINT); } @Test public void testLegacyCompositeOverrides() throws Exception { - testCompositeOverrides(LEGACY_OPENDISTRO_CONFIG_OVERRIDES_ENDPOINT); + testCompositeOverrides( + RestConfig.LEGACY_PA_BASE_URI, LEGACY_OPENDISTRO_CONFIG_OVERRIDES_ENDPOINT); } - public void testCompositeOverrides(String configOverridesEndpoint) throws Exception { - ensurePaAndRcaEnabled(configOverridesEndpoint); + public void testCompositeOverrides(String paBaseUri, String configOverridesEndpoint) + throws Exception { + ensurePaAndRcaEnabled(paBaseUri); final ConfigOverrides initialOverrides = getOverrides(