Merge remote-tracking branch 'upstream/main' into add_2.9.0_osd_manif…

…ests

.github/workflows/os-increment-plugin-versions.yml

@@ -85,6 +85,40 @@ jobs:
           app_id: ${{ secrets.APP_ID }}
           private_key: ${{ secrets.APP_PRIVATE_KEY }}
           installation_id: 22958780
+      - name: Check and Create label
+        id: check_create_label
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{ steps.github_app_token.outputs.token }}
+          result-encoding: string
+          script: |
+            const labelName = "v${{ env.OPENSEARCH_VERSION_NUMBER }}";
+            let labelFound = false;
+            try {
+              const label = await github.rest.issues.getLabel({
+                owner: context.repo.owner,
+                repo: "${{ matrix.entry.repo }}",
+                name: labelName
+              });
+              labelFound = true;
+            } catch (error) {
+              if (error.status === 404) {
+                const randomColor = Math.floor(Math.random() * 16777215).toString(16);
+                const newLabel = {
+                  owner: context.repo.owner,
+                  repo: "${{ matrix.entry.repo }}",
+                  name: labelName,
+                  color: randomColor,
+                  description: 'Label description'
+                };
+                await github.rest.issues.createLabel(newLabel);
+                labelFound = true;
+              } else {
+                throw error;
+              }
+            }
+            console.log(labelFound);
+            return labelFound
       - name: Create Pull Request
         id: cpr
         uses: peter-evans/create-pull-request@v4
@@ -99,6 +133,8 @@ jobs:
           delete-branch: true
           branch: create-pull-request/${{ env.OPENSEARCH_VERSION }}
           title: '[AUTO] Increment version to ${{ env.OPENSEARCH_VERSION }}'
+          labels: |
+            v${{ env.OPENSEARCH_VERSION_NUMBER }}
           body: |
             - Incremented version to **${{ env.OPENSEARCH_VERSION }}**.
       - name: Check outputs

.github/workflows/osd-increment-plugin-versions.yml

@@ -71,6 +71,7 @@ jobs:
       - name: Bootstrap and Version Increment
         run: |
           DASHBOARD_VERSION=$(node -p "require('./OpenSearch-Dashboards/package.json').version")
+          echo "DASHBOARD_VERSION=$DASHBOARD_VERSION" >> $GITHUB_ENV
           cd OpenSearch-Dashboards/plugins/${{ matrix.entry.repo }}
           if [ ${{ matrix.entry.path }} ]; then
               yarn osd bootstrap
@@ -101,6 +102,40 @@ jobs:
           app_id: ${{ secrets.APP_ID }}
           private_key: ${{ secrets.APP_PRIVATE_KEY }}
           installation_id: 22958780
+      - name: Check if label exists
+        id: check_label
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{ steps.github_app_token.outputs.token }}
+          result-encoding: string
+          script: |
+            const labelName = "v${{ env.DASHBOARD_VERSION }}";
+            let labelFound = false;
+            try {
+              const label = await github.rest.issues.getLabel({
+                owner: context.repo.owner,
+                repo: "${{ matrix.entry.repo }}",
+                name: labelName
+              });
+              labelFound = true;
+            } catch (error) {
+              if (error.status === 404) {
+                const randomColor = Math.floor(Math.random() * 16777215).toString(16);
+                const newLabel = {
+                  owner: context.repo.owner,
+                  repo: "${{ matrix.entry.repo }}",
+                  name: labelName,
+                  color: randomColor,
+                  description: 'Label description'
+                };
+                await github.rest.issues.createLabel(newLabel);
+                labelFound = true;
+              } else {
+                throw error;
+              }
+            }
+            console.log(labelFound);
+            return labelFound
       - name: Create Pull Request
         id: cpr
         uses: peter-evans/create-pull-request@v5
@@ -115,6 +150,8 @@ jobs:
           delete-branch: true
           branch: create-pull-request/${{ env.OSD_PLUGIN_VERSION }}
           title: '[AUTO] Increment version to ${{ env.OSD_PLUGIN_VERSION }}'
+          labels: |
+            v${{ env.DASHBOARD_VERSION }}
           body: |
             - Incremented version to **${{ env.OSD_PLUGIN_VERSION }}**.
           path: 'OpenSearch-Dashboards/plugins/${{ matrix.entry.repo }}'

jenkins/check-for-build.jenkinsfile

@@ -18,8 +18,6 @@ pipeline {
             H 1 * * * %INPUT_MANIFEST=2.9.0/opensearch-2.9.0.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux macos windows;BUILD_DISTRIBUTION=tar rpm deb zip
             H 1 * * * %INPUT_MANIFEST=2.8.1/opensearch-2.8.1.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux macos windows;BUILD_DISTRIBUTION=tar rpm deb zip
             H 1 * * * %INPUT_MANIFEST=1.4.0/opensearch-1.4.0.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux macos windows;BUILD_DISTRIBUTION=tar rpm zip
-            H/60 * * * * %INPUT_MANIFEST=1.3.11/opensearch-1.3.11.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux macos windows;BUILD_DISTRIBUTION=tar rpm deb zip
-            H/60 * * * * %INPUT_MANIFEST=1.3.11/opensearch-dashboards-1.3.11.yml;TARGET_JOB_NAME=distribution-build-opensearch-dashboards;BUILD_PLATFORM=linux windows;BUILD_DISTRIBUTION=tar rpm deb zip
             H 1 * * * %INPUT_MANIFEST=1.4.0/opensearch-dashboards-1.4.0.yml;TARGET_JOB_NAME=distribution-build-opensearch-dashboards;BUILD_PLATFORM=linux windows;BUILD_DISTRIBUTION=tar rpm zip
             H 1 * * * %INPUT_MANIFEST=3.0.0/opensearch-3.0.0.yml;TEST_MANIFEST=3.0.0/opensearch-3.0.0-test.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux macos windows;BUILD_DISTRIBUTION=tar rpm deb zip
             H 1 * * * %INPUT_MANIFEST=3.0.0/opensearch-dashboards-3.0.0.yml;TARGET_JOB_NAME=distribution-build-opensearch-dashboards;BUILD_PLATFORM=linux windows;BUILD_DISTRIBUTION=tar rpm deb zip

jenkins/opensearch/distribution-build.jenkinsfile

@@ -1,4 +1,4 @@
-lib = library(identifier: 'jenkins@1.5.4', retriever: modernSCM([
+lib = library(identifier: 'jenkins@4.3.0', retriever: modernSCM([
     $class: 'GitSCMSource',
     remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
 ]))

jenkins/opensearch/integ-test.jenkinsfile

@@ -32,8 +32,8 @@ pipeline {
     }
     triggers {
         parameterizedCron '''
-            H 30 * * * %TEST_MANIFEST=2.9.0/opensearch-2.9.0-seg-rep-test.yml;BUILD_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.9.0/latest/linux/arm64/tar/builds/opensearch/manifest.yml
-            H 30 * * * %TEST_MANIFEST=2.9.0/opensearch-2.9.0-seg-rep-test.yml;BUILD_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.9.0/latest/linux/x64/tar/builds/opensearch/manifest.yml
+            H 3 * * * %TEST_MANIFEST=2.9.0/opensearch-2.9.0-seg-rep-test.yml;BUILD_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.9.0/latest/linux/arm64/tar/builds/opensearch/manifest.yml
+            H 3 * * * %TEST_MANIFEST=2.9.0/opensearch-2.9.0-seg-rep-test.yml;BUILD_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.9.0/latest/linux/x64/tar/builds/opensearch/manifest.yml
             '''
     }
     parameters {

jenkins/opensearch/perf-test.jenkinsfile

@@ -16,14 +16,14 @@ pipeline {
     }
     triggers {
         parameterizedCron '''
-            H 12 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.10/7848/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_ITERATIONS=3;WARMUP_ITERATIONS=2
-            H 12 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.10/7848/linux/x64/tar/dist/opensearch/manifest.yml;TEST_ITERATIONS=3;WARMUP_ITERATIONS=2
-            H 12 * * 3 %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.10/7848/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_ITERATIONS=250;WARMUP_ITERATIONS=0
-            H 12 * * 5 %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.10/7848/linux/x64/tar/dist/opensearch/manifest.yml;TEST_ITERATIONS=250;WARMUP_ITERATIONS=0
-            H 12 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.10/7848/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=http_logs;TEST_ITERATIONS=3;WARMUP_ITERATIONS=2
-            H 12 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.10/7848/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=http_logs;TEST_ITERATIONS=3;WARMUP_ITERATIONS=2
-            H 12 * * 3 %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.10/7848/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=http_logs;TEST_ITERATIONS=250;WARMUP_ITERATIONS=0
-            H 12 * * 5 %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.10/7848/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=http_logs;TEST_ITERATIONS=250;WARMUP_ITERATIONS=0
+            H 12 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.11/8029/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_ITERATIONS=3;WARMUP_ITERATIONS=2
+            H 12 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.11/8029/linux/x64/tar/dist/opensearch/manifest.yml;TEST_ITERATIONS=3;WARMUP_ITERATIONS=2
+            H 12 * * 3 %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.11/8029/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_ITERATIONS=250;WARMUP_ITERATIONS=0
+            H 12 * * 5 %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.11/8029/linux/x64/tar/dist/opensearch/manifest.yml;TEST_ITERATIONS=250;WARMUP_ITERATIONS=0
+            H 12 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.11/8029/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=http_logs;TEST_ITERATIONS=3;WARMUP_ITERATIONS=2
+            H 12 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.11/8029/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=http_logs;TEST_ITERATIONS=3;WARMUP_ITERATIONS=2
+            H 12 * * 3 %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.11/8029/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=http_logs;TEST_ITERATIONS=250;WARMUP_ITERATIONS=0
+            H 12 * * 5 %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.11/8029/linux/x64/tar/dist/opensearch/manifest.yml;TEST_WORKLOAD=http_logs;TEST_ITERATIONS=250;WARMUP_ITERATIONS=0
 
             H 8 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.7.0/7771/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_ITERATIONS=3;WARMUP_ITERATIONS=2
             H 8 * * * %BUNDLE_MANIFEST_URL=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.7.0/7771/linux/arm64/tar/dist/opensearch/manifest.yml;TEST_ITERATIONS=250;WARMUP_ITERATIONS=0

manifests/1.3.11/opensearch-1.3.11.yml

@@ -10,13 +10,13 @@ ci:
 components:
   - name: OpenSearch
     repository: https://github.com/opensearch-project/OpenSearch.git
-    ref: '1.3'
+    ref: d104ed30b8c30d4e3313c30882ca8563feef5775
     checks:
       - gradle:publish
       - gradle:properties:version
   - name: common-utils
     repository: https://github.com/opensearch-project/common-utils.git
-    ref: '1.3'
+    ref: ca431cdb2383e3832abe73a711eb3497573251a1
     checks:
       - gradle:publish
       - gradle:properties:version
@@ -25,7 +25,7 @@ components:
       - windows
   - name: job-scheduler
     repository: https://github.com/opensearch-project/job-scheduler.git
-    ref: '1.3'
+    ref: 4a5d0ab9aed6fa5a3e2f7de868eb85e1bc00e9e5
     checks:
       - gradle:properties:version
       - gradle:dependencies:opensearch.version
@@ -34,7 +34,7 @@ components:
       - windows
   - name: alerting
     repository: https://github.com/opensearch-project/alerting.git
-    ref: '1.3'
+    ref: da4f4e8fe024da6c68733833d04e19c694ddbabf
     checks:
       - gradle:properties:version
       - gradle:dependencies:opensearch.version: alerting
@@ -43,7 +43,7 @@ components:
       - windows
   - name: opensearch-reports
     repository: https://github.com/opensearch-project/reporting.git
-    ref: '1.3'
+    ref: a3be3b9c49a5e2909dc42852b1ec469606bcfd25
     checks:
       - gradle:properties:version
       - gradle:dependencies:opensearch.version
@@ -52,7 +52,7 @@ components:
       - windows
   - name: cross-cluster-replication
     repository: https://github.com/opensearch-project/cross-cluster-replication.git
-    ref: '1.3'
+    ref: a0ed3f35d632171caeec0ce63ee71cc729323be2
     checks:
       - gradle:properties:version
       - gradle:dependencies:opensearch.version
@@ -61,7 +61,7 @@ components:
       - windows
   - name: security
     repository: https://github.com/opensearch-project/security.git
-    ref: '1.3'
+    ref: ae3a0654f0133a2898500ba3c007e6495fb0c65f
     checks:
       - gradle:properties:version
       - gradle:dependencies:opensearch.version
@@ -70,7 +70,7 @@ components:
       - windows
   - name: ml-commons
     repository: https://github.com/opensearch-project/ml-commons.git
-    ref: '1.3'
+    ref: fa6bc4e2191eab912328094b5be3c6d797be0dbb
     checks:
       - gradle:properties:version
       - gradle:dependencies:opensearch.version: opensearch-ml-plugin
@@ -79,6 +79,112 @@ components:
       - windows
   - name: asynchronous-search
     repository: https://github.com/opensearch-project/asynchronous-search.git
+    ref: cd3db891d46b7a9fdad1e31a915cdab8e1cfab57
+    checks:
+      - gradle:properties:version
+      - gradle:dependencies:opensearch.version
+    platforms:
+      - linux
+      - windows
+  - name: sql
+    repository: https://github.com/opensearch-project/sql.git
+    ref: 5e9ef27e29f8b40620ae1ef2e6dd5d5f87ef9644
+    checks:
+      - gradle:properties:version
+      - gradle:dependencies:opensearch.version: plugin
+    platforms:
+      - linux
+      - windows
+  - name: k-NN
+    repository: https://github.com/opensearch-project/k-NN.git
+    ref: 5e87009aaf4a73801a4e137669efc9cfc1dc83ca
+    checks:
+      - gradle:properties:version
+      - gradle:dependencies:opensearch.version
+    platforms:
+      - linux
+      - windows
+  - name: performance-analyzer
+    repository: https://github.com/opensearch-project/performance-analyzer.git
+    ref: f7f75339583b2ea6ba1fb807439807ec34dc7c71
+    checks:
+      - gradle:properties:version
+      - gradle:dependencies:opensearch.version
+    platforms:
+      - linux
+  - name: opensearch-observability
+    repository: https://github.com/opensearch-project/observability.git
+    ref: 953ddff44e268a1780e6fce649cfe8c321f4c543
+    checks:
+      - gradle:properties:version
+      - gradle:dependencies:opensearch.version
+    platforms:
+      - linux
+      - windows
+  - name: anomaly-detection
+    repository: https://github.com/opensearch-project/anomaly-detection.git
+    ref: 8a063489d328d6e0ee9af2b01bbdaae6c6d4fcf4
+    checks:
+      - gradle:properties:version
+      - gradle:dependencies:opensearch.version
+    platforms:
+      - linux
+      - windows
+  - name: index-management
+    repository: https://github.com/opensearch-project/index-management.git
+    ref: 6d7395380d578b8ec5010e779143feea90d6edaa
+    checks:
+      - gradle:properties:version
+      - gradle:dependencies:opensearch.version
+    platforms:
+      - linux
+      - windows
+  - name: sql
+    repository: https://github.com/opensearch-project/sql.git
+    ref: '1.3'
+    checks:
+      - gradle:properties:version
+      - gradle:dependencies:opensearch.version: plugin
+    platforms:
+      - linux
+      - windows
+  - name: k-NN
+    repository: https://github.com/opensearch-project/k-NN.git
+    ref: '1.3'
+    checks:
+      - gradle:properties:version
+      - gradle:dependencies:opensearch.version
+    platforms:
+      - linux
+      - windows
+  - name: performance-analyzer
+    repository: https://github.com/opensearch-project/performance-analyzer.git
+    ref: '1.3'
+    checks:
+      - gradle:properties:version
+      - gradle:dependencies:opensearch.version
+    platforms:
+      - linux
+  - name: opensearch-observability
+    repository: https://github.com/opensearch-project/observability.git
+    ref: '1.3'
+    checks:
+      - gradle:properties:version
+      - gradle:dependencies:opensearch.version
+    platforms:
+      - linux
+      - windows
+  - name: anomaly-detection
+    repository: https://github.com/opensearch-project/anomaly-detection.git
+    ref: '1.3'
+    checks:
+      - gradle:properties:version
+      - gradle:dependencies:opensearch.version
+    platforms:
+      - linux
+      - windows
+  - name: index-management
+    repository: https://github.com/opensearch-project/index-management.git
     ref: '1.3'
     checks:
       - gradle:properties:version

manifests/1.3.11/opensearch-dashboards-1.3.11.yml

@@ -9,32 +9,32 @@ ci:
 components:
   - name: OpenSearch-Dashboards
     repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git
-    ref: '1.3'
+    ref: c8a5993c90f717a1fafb7048152f085a4ed809ec
   - name: anomalyDetectionDashboards
     repository: https://github.com/opensearch-project/anomaly-detection-dashboards-plugin
-    ref: '1.3'
+    ref: 1e29c087a125153e6851d63b34199a261da6c3f0
   - name: functionalTestDashboards
     repository: https://github.com/opensearch-project/opensearch-dashboards-functional-test.git
-    ref: '1.3'
+    ref: 14047e71947be04ce89320eb33a82f0060830d05
   - name: ganttChartDashboards
     repository: https://github.com/opensearch-project/dashboards-visualizations.git
     working_directory: gantt-chart
-    ref: '1.3'
+    ref: 157f9829b318359d78c987c96ad75984fa7b9633
   - name: observabilityDashboards
     repository: https://github.com/opensearch-project/dashboards-observability.git
-    ref: '1.3'
+    ref: 3f7b601bbfffcd06b486d8d8dc6502e6f6a71120
   - name: alertingDashboards
     repository: https://github.com/opensearch-project/alerting-dashboards-plugin.git
-    ref: '1.3'
+    ref: 31b910dcb42dc6086422a3f067edc87784265d29
   - name: indexManagementDashboards
     repository: https://github.com/opensearch-project/index-management-dashboards-plugin
-    ref: '1.3'
+    ref: bf83036ad0c8f1a6078037decac3cc386ca01fc3
   - name: reportsDashboards
     repository: https://github.com/opensearch-project/dashboards-reporting.git
-    ref: '1.3'
+    ref: fee8de85a6a42e1302aad127c6e7314878c3884c
   - name: securityDashboards
     repository: https://github.com/opensearch-project/security-dashboards-plugin.git
-    ref: '1.3'
+    ref: fce0fa836d133d3cf054a4b89c19dbde7bbc1000
   - name: queryWorkbenchDashboards
     repository: https://github.com/opensearch-project/dashboards-query-workbench.git
-    ref: '1.3'
+    ref: 6ce0064b1bce7535a8bfbfdae5cb6e8ee68ec504

src/sign_workflow/sign_args.py

@@ -13,7 +13,7 @@
 
 class SignArgs:
     ACCEPTED_SIGNATURE_FILE_TYPES = [".sig", ".asc"]
-    ACCEPTED_PLATFORM = ["linux", "windows"]
+    ACCEPTED_PLATFORM = ["linux", "windows", "mac"]
 
     target: Path
     components: List[str]