Merge branch 'opensearch-project:main' into main

opensearch-project · Sep 13, 2024 · 72dd406 · 72dd406
2 parents 32bab1e + a92358b
commit 72dd406
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/jenkins/release-workflows/release-notes-check.jenkinsfile b/jenkins/release-workflows/release-notes-check.jenkinsfile
@@ -126,7 +126,7 @@ pipeline {
                     sh """
                         #!/bin/bash
                         set +e
-                        ./release_notes.sh compile manifests/${RELEASE_VERSION}/opensearch-${RELEASE_VERSION}.yml manifests/${RELEASE_VERSION}/opensearch-dashboards-${RELEASE_VERSION}.yml --output opensearch-release-notes-${RELEASE_VERSION}.md
+                        ./release_notes.sh compile manifests/${RELEASE_VERSION}/opensearch-${RELEASE_VERSION}.yml manifests/${RELEASE_VERSION}/opensearch-dashboards-${RELEASE_VERSION}.yml --output release-notes/opensearch-release-notes-${RELEASE_VERSION}.md
                     """
                     withCredentials([usernamePassword(credentialsId: 'jenkins-github-bot-token', passwordVariable: 'GITHUB_TOKEN', usernameVariable: 'GITHUB_USER')]) {
                         try {

diff --git a/manifests/2.17.0/opensearch-2.17.0.yml b/manifests/2.17.0/opensearch-2.17.0.yml
@@ -10,7 +10,7 @@ ci:
 components:
   - name: OpenSearch
     repository: https://github.com/opensearch-project/OpenSearch.git
-    ref: 6729220987d152270d1fce41689fdbf1e6165fd3
+    ref: 8586481dc99b1740ca3c7c966aee15ad0fc7b412
   - name: common-utils
     repository: https://github.com/opensearch-project/common-utils.git
     ref: 15480c93af342cfcd5a5ac9c99de1ec364cdbd2c
@@ -31,7 +31,7 @@ components:
       - windows
   - name: k-NN
     repository: https://github.com/opensearch-project/k-NN.git
-    ref: 272324c9197b1bcb4e32a7ee8f55c516580800fc
+    ref: 00328ecd414ff765c71eddc77b385b528a54fd5a
     platforms:
       - linux
       - windows
@@ -193,7 +193,7 @@ components:
       - windows
   - name: opensearch-system-templates
     repository: https://github.com/opensearch-project/opensearch-system-templates.git
-    ref: d709a0ca8151b79b7e4535b597f9457648baec76
+    ref: b38bad932f9f71551fa443909a7cc308f94a4ee4
     platforms:
       - linux
       - windows
diff --git a/manifests/2.17.0/opensearch-dashboards-2.17.0.yml b/manifests/2.17.0/opensearch-dashboards-2.17.0.yml
@@ -9,13 +9,13 @@ ci:
 components:
   - name: OpenSearch-Dashboards
     repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git
-    ref: 5311b5fd63ac54f18ac742f36ab7fee6cbcf8ecd
+    ref: 2fc39e8350bee3f2f91e4bb46dca2fd7d9c3b623
   - name: functionalTestDashboards
     repository: https://github.com/opensearch-project/opensearch-dashboards-functional-test.git
     ref: '2.17'
   - name: observabilityDashboards
     repository: https://github.com/opensearch-project/dashboards-observability.git
-    ref: 2cf76b62e4036144cc1259bcde0adb716017c743
+    ref: 6000f7ddc7fb2cf673a8261d5016768991d50899
   - name: reportsDashboards
     repository: https://github.com/opensearch-project/dashboards-reporting.git
     ref: 1aadb2e9a104b14954976410d43a638ee1b6c04f
@@ -24,7 +24,7 @@ components:
     ref: 1357c301120e0c9053a9dbb1bf4cb2fe45fea303
   - name: queryWorkbenchDashboards
     repository: https://github.com/opensearch-project/dashboards-query-workbench.git
-    ref: 6dc1030c27bf6152e273abe5cf64a7f3dcef3280
+    ref: 7675047482e5043905b06a77389380881380cf30
   - name: customImportMapDashboards
     repository: https://github.com/opensearch-project/dashboards-maps.git
     ref: cc9b073e75123af75a33cdd4c29a65bb68242c9e

diff --git a/tests/jenkins/TestReleaseNotesCheckAndCompile.groovy b/tests/jenkins/TestReleaseNotesCheckAndCompile.groovy
@@ -75,7 +75,7 @@ class TestReleaseNotesCheckAndCompile extends BuildPipelineTest {
         assertThat(helper.callStack.findAll { call ->
             call.methodName == 'sh'
         }.any { call ->
-            callArgsToString(call).contains('./release_notes.sh compile manifests/3.0.0/opensearch-3.0.0.yml manifests/3.0.0/opensearch-dashboards-3.0.0.yml --output opensearch-release-notes-3.0.0.md')
+            callArgsToString(call).contains('./release_notes.sh compile manifests/3.0.0/opensearch-3.0.0.yml manifests/3.0.0/opensearch-dashboards-3.0.0.yml --output release-notes/opensearch-release-notes-3.0.0.md')
         }).isTrue()
     }
 }
diff --git a/...nkins/jenkinsjob-regression-files/release-workflows/release-notes-compile.jenkinsfile.txt b/...nkins/jenkinsjob-regression-files/release-workflows/release-notes-compile.jenkinsfile.txt
@@ -12,7 +12,7 @@
                release-notes-check.sh(
                         #!/bin/bash
                         set +e
-                        ./release_notes.sh compile manifests/3.0.0/opensearch-3.0.0.yml manifests/3.0.0/opensearch-dashboards-3.0.0.yml --output opensearch-release-notes-3.0.0.md
+                        ./release_notes.sh compile manifests/3.0.0/opensearch-3.0.0.yml manifests/3.0.0/opensearch-dashboards-3.0.0.yml --output release-notes/opensearch-release-notes-3.0.0.md
                     )
                release-notes-check.usernamePassword({credentialsId=jenkins-github-bot-token, passwordVariable=GITHUB_TOKEN, usernameVariable=GITHUB_USER})
                release-notes-check.withCredentials([[GITHUB_USER, GITHUB_TOKEN]], groovy.lang.Closure)