From 52036c8310ab29e82da439454e5fe7a7a2ffe122 Mon Sep 17 00:00:00 2001 From: zane-neo Date: Tue, 30 Jan 2024 10:06:57 +0800 Subject: [PATCH 1/4] Onboading skills repo Signed-off-by: zane-neo --- .github/workflows/os-increment-plugin-versions.yml | 1 + .github/workflows/os-release-issues.yml | 1 + .../opensearch-2.12.0-concurrent-search-test.yml | 9 +++++++++ manifests/2.12.0/opensearch-2.12.0-test.yml | 6 ++++++ manifests/2.12.0/opensearch-2.12.0.yml | 13 +++++++++++++ 5 files changed, 30 insertions(+) diff --git a/.github/workflows/os-increment-plugin-versions.yml b/.github/workflows/os-increment-plugin-versions.yml index 1ee0c51cba..277a431923 100644 --- a/.github/workflows/os-increment-plugin-versions.yml +++ b/.github/workflows/os-increment-plugin-versions.yml @@ -46,6 +46,7 @@ jobs: - {repo: security-analytics} - {repo: sql} - {repo: custom-codecs} + - {repo: skills} branch: - '1.3' - 2.x diff --git a/.github/workflows/os-release-issues.yml b/.github/workflows/os-release-issues.yml index 4f1a012a11..27cad7ce26 100644 --- a/.github/workflows/os-release-issues.yml +++ b/.github/workflows/os-release-issues.yml @@ -57,6 +57,7 @@ jobs: - {repo: security} - {repo: security-analytics} - {repo: sql} + - {repo: skills} release_version: ${{ fromJson(needs.list-manifest-versions.outputs.matrix) }} steps: - name: GitHub App token diff --git a/manifests/2.12.0/opensearch-2.12.0-concurrent-search-test.yml b/manifests/2.12.0/opensearch-2.12.0-concurrent-search-test.yml index 6976890695..b3e2427f0a 100644 --- a/manifests/2.12.0/opensearch-2.12.0-concurrent-search-test.yml +++ b/manifests/2.12.0/opensearch-2.12.0-concurrent-search-test.yml @@ -198,3 +198,12 @@ components: opensearch.experimental.feature.concurrent_segment_search.enabled: true search.concurrent_segment_search.enabled: true search.concurrent.max_slice_count: 2 + - name: skills + integ-test: + test-configs: + - with-security + - without-security + additional-cluster-configs: + opensearch.experimental.feature.concurrent_segment_search.enabled: true + search.concurrent_segment_search.enabled: true + search.concurrent.max_slice_count: 2 diff --git a/manifests/2.12.0/opensearch-2.12.0-test.yml b/manifests/2.12.0/opensearch-2.12.0-test.yml index 1baac5286a..25cc666956 100644 --- a/manifests/2.12.0/opensearch-2.12.0-test.yml +++ b/manifests/2.12.0/opensearch-2.12.0-test.yml @@ -143,3 +143,9 @@ components: test-configs: - with-security - without-security + + - name: skills + integ-test: + test-configs: + - with-security + - without-security diff --git a/manifests/2.12.0/opensearch-2.12.0.yml b/manifests/2.12.0/opensearch-2.12.0.yml index 70878826e2..92ec624678 100644 --- a/manifests/2.12.0/opensearch-2.12.0.yml +++ b/manifests/2.12.0/opensearch-2.12.0.yml @@ -172,3 +172,16 @@ components: - windows depends_on: - common-utils + - name: skills + repository: https://github.com/opensearch-project/skills.git + ref: 2.x + platforms: + - linux + - windows + checks: + - gradle:properties:version + - gradle:dependencies:opensearch.version + depends_on: + - anomaly-detection + - sql + - ml-commons From 85f21963d241855c08cd430e10d236e0ba01dd5f Mon Sep 17 00:00:00 2001 From: zane-neo Date: Tue, 30 Jan 2024 10:11:53 +0800 Subject: [PATCH 2/4] Add job-scheduler dependency Signed-off-by: zane-neo --- manifests/2.12.0/opensearch-2.12.0.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/manifests/2.12.0/opensearch-2.12.0.yml b/manifests/2.12.0/opensearch-2.12.0.yml index 92ec624678..630c59787a 100644 --- a/manifests/2.12.0/opensearch-2.12.0.yml +++ b/manifests/2.12.0/opensearch-2.12.0.yml @@ -182,6 +182,7 @@ components: - gradle:properties:version - gradle:dependencies:opensearch.version depends_on: + - job-scheduler - anomaly-detection - sql - ml-commons From f966eb9dc278813d1e2c18c851c13217df1e316f Mon Sep 17 00:00:00 2001 From: zane-neo Date: Wed, 31 Jan 2024 09:10:33 +0800 Subject: [PATCH 3/4] address comments Signed-off-by: zane-neo --- manifests/2.12.0/opensearch-2.12.0-concurrent-search-test.yml | 1 + manifests/2.12.0/opensearch-2.12.0.yml | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/manifests/2.12.0/opensearch-2.12.0-concurrent-search-test.yml b/manifests/2.12.0/opensearch-2.12.0-concurrent-search-test.yml index b3e2427f0a..75a9dd4a02 100644 --- a/manifests/2.12.0/opensearch-2.12.0-concurrent-search-test.yml +++ b/manifests/2.12.0/opensearch-2.12.0-concurrent-search-test.yml @@ -198,6 +198,7 @@ components: opensearch.experimental.feature.concurrent_segment_search.enabled: true search.concurrent_segment_search.enabled: true search.concurrent.max_slice_count: 2 + - name: skills integ-test: test-configs: diff --git a/manifests/2.12.0/opensearch-2.12.0.yml b/manifests/2.12.0/opensearch-2.12.0.yml index 630c59787a..681f3281c6 100644 --- a/manifests/2.12.0/opensearch-2.12.0.yml +++ b/manifests/2.12.0/opensearch-2.12.0.yml @@ -178,9 +178,6 @@ components: platforms: - linux - windows - checks: - - gradle:properties:version - - gradle:dependencies:opensearch.version depends_on: - job-scheduler - anomaly-detection From 2f3559624398ceea8c3d943c4451f32eb7ae43c6 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Wed, 31 Jan 2024 16:42:26 -0500 Subject: [PATCH 4/4] Add missing components Signed-off-by: Peter Zhu --- .github/workflows/os-increment-plugin-versions.yml | 1 + .github/workflows/os-release-issues.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/os-increment-plugin-versions.yml b/.github/workflows/os-increment-plugin-versions.yml index 277a431923..f3531cce72 100644 --- a/.github/workflows/os-increment-plugin-versions.yml +++ b/.github/workflows/os-increment-plugin-versions.yml @@ -46,6 +46,7 @@ jobs: - {repo: security-analytics} - {repo: sql} - {repo: custom-codecs} + - {repo: flow-framework} - {repo: skills} branch: - '1.3' diff --git a/.github/workflows/os-release-issues.yml b/.github/workflows/os-release-issues.yml index 72e20c81ff..c2e4f27bd2 100644 --- a/.github/workflows/os-release-issues.yml +++ b/.github/workflows/os-release-issues.yml @@ -57,6 +57,7 @@ jobs: - {repo: security} - {repo: security-analytics} - {repo: sql} + - {repo: custom-codecs} - {repo: flow-framework} - {repo: skills} release_version: ${{ fromJson(needs.list-manifest-versions.outputs.matrix) }}