From e67974e7446a06417b9402a7b64c72997e103558 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Mon, 17 Jul 2023 23:02:27 -0400 Subject: [PATCH 1/3] Add -SNAPSHOT Signed-off-by: Craig Perkins --- bwc-test/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bwc-test/build.gradle b/bwc-test/build.gradle index 9f5c752287..68b9f27e04 100644 --- a/bwc-test/build.gradle +++ b/bwc-test/build.gradle @@ -84,8 +84,8 @@ String baseName = "securityBwcCluster" String bwcFilePath = "src/test/resources/" String projectVersion = nextVersion -String previousOpenSearch = extractVersion(previousVersion); -String nextOpenSearch = extractVersion(nextVersion); +String previousOpenSearch = extractVersion(previousVersion) + "-SNAPSHOT"; +String nextOpenSearch = extractVersion(nextVersion) + "-SNAPSHOT"; println previousOpenSearch + nextOpenSearch; From c4c71599779bfc3fd94a67d4b2aef9a5e862d536 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Mon, 17 Jul 2023 23:09:38 -0400 Subject: [PATCH 2/3] Build SNAPSHOT for security plugin in bwc tests Signed-off-by: Craig Perkins --- .github/actions/create-bwc-build/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/create-bwc-build/action.yaml b/.github/actions/create-bwc-build/action.yaml index fcfa612a7d..7dee52fbd7 100644 --- a/.github/actions/create-bwc-build/action.yaml +++ b/.github/actions/create-bwc-build/action.yaml @@ -35,7 +35,7 @@ runs: - name: Build uses: gradle/gradle-build-action@v2 with: - arguments: assemble -Dbuild.snapshot=false + arguments: assemble build-root-directory: ${{ inputs.plugin-branch }} - id: get-opensearch-version From 53c0fec14118189d98a369dea92feed1cc97ebe3 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Mon, 17 Jul 2023 23:26:28 -0400 Subject: [PATCH 3/3] Add -SNAPSHOT Signed-off-by: Craig Perkins --- .github/actions/create-bwc-build/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/create-bwc-build/action.yaml b/.github/actions/create-bwc-build/action.yaml index 7dee52fbd7..a2bf324cdc 100644 --- a/.github/actions/create-bwc-build/action.yaml +++ b/.github/actions/create-bwc-build/action.yaml @@ -46,5 +46,5 @@ runs: - name: Copy current distro into the expected folder run: | mkdir -p ./bwc-test/src/test/resources/${{ steps.get-opensearch-version.outputs.version }} - cp ${{ inputs.plugin-branch }}/build/distributions/opensearch-security-${{ steps.get-opensearch-version.outputs.version }}.zip ./bwc-test/src/test/resources/${{ steps.get-opensearch-version.outputs.version }} + cp ${{ inputs.plugin-branch }}/build/distributions/opensearch-security-${{ steps.get-opensearch-version.outputs.version }}-SNAPSHOT.zip ./bwc-test/src/test/resources/${{ steps.get-opensearch-version.outputs.version }} shell: bash