From 3e868ae7c56ac25da44545d9db56924f5efebb91 Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Mon, 15 May 2023 14:26:42 -0400 Subject: [PATCH 1/4] fix bwc version Signed-off-by: Derek Ho --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 7bddc605..8d92338a 100644 --- a/build.gradle +++ b/build.gradle @@ -329,8 +329,8 @@ String baseVersion = "2.7.0" String bwcVersion = baseVersion + ".0" String baseName = "reportsSchedulerBwcCluster" String bwcFilePath = "src/test/resources/bwc" -String bwcJobSchedulerURL = "https://aws.oss.sonatype.org/content/repositories/snapshots/org/opensearch/plugin/opensearch-job-scheduler/2.7.0.0-SNAPSHOT/opensearch-job-scheduler-2.7.0.0-20230412.230425-26.zip" -String bwcReportsSchedulerURL = "https://aws.oss.sonatype.org/content/repositories/snapshots/org/opensearch/plugin/opensearch-reports-scheduler/2.7.0.0-SNAPSHOT/opensearch-reports-scheduler-2.7.0.0-20230418.163501-5.zip" +String bwcJobSchedulerURL = "https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-reports-scheduler&v=$bwcVersion-SNAPSHOT&p=zip" +String bwcReportsSchedulerURL = "https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-job-scheduler&v=$bwcVersion-SNAPSHOT&p=zip" 2.times {i -> testClusters { From 89a565c6dcd8e4799681742443a9e46e237a341f Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Mon, 15 May 2023 14:27:22 -0400 Subject: [PATCH 2/4] actually bump the version Signed-off-by: Derek Ho --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8d92338a..85e15c09 100644 --- a/build.gradle +++ b/build.gradle @@ -325,7 +325,7 @@ testClusters.integTest { } // For job-scheduler and reports-scheduler, the latest opensearch releases appear to be 1.1.0.0. -String baseVersion = "2.7.0" +String baseVersion = "2.8.0" String bwcVersion = baseVersion + ".0" String baseName = "reportsSchedulerBwcCluster" String bwcFilePath = "src/test/resources/bwc" From f8378d1e9954d7a1c6e6bac2625305dce0b5df82 Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Mon, 31 Jul 2023 12:38:56 -0400 Subject: [PATCH 3/4] fix fail backport Signed-off-by: Derek Ho --- .github/workflows/backport.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index e47d8d88..9537ddeb 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -22,7 +22,9 @@ jobs: installation_id: 22958780 - name: Backport - uses: VachaShah/backport@v1.1.4 + uses: VachaShah/backport@v2.2.0 with: github_token: ${{ steps.github_app_token.outputs.token }} - branch_name: backport/backport-${{ github.event.number }} + head_template: backport/backport-<%= number %>-to-<%= base %> + labels_template: "<%= JSON.stringify([...labels, 'autocut']) %>" + failure_labels: "failed backport" From 05e3afca414b8aed05a873216cde678eac6765e8 Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Tue, 1 Aug 2023 11:52:59 -0400 Subject: [PATCH 4/4] revert build.gradle Signed-off-by: Derek Ho --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 36b0352c..510fe62b 100644 --- a/build.gradle +++ b/build.gradle @@ -325,7 +325,7 @@ testClusters.integTest { } // For job-scheduler and reports-scheduler, the latest opensearch releases appear to be 1.1.0.0. -String baseVersion = "2.9.0" +String baseVersion = "2.8.0" String bwcVersion = baseVersion + ".0" String baseName = "reportsSchedulerBwcCluster" String bwcFilePath = "src/test/resources/bwc"