From 89c820a32a1a205ab3d1f6b8c78051aa97423cf7 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 17 Nov 2021 08:55:57 -0800 Subject: [PATCH] remove job building os core in integration test (#860) * Updated copyright notices (cherry-picked from commit a48786e) Signed-off-by: Jason --- .github/workflows/integration-test.yml | 17 +++-------------- .github/workflows/unit-test.yml | 3 ++- ...y-dashboards-plugin.release-notes-1.2.0.0.md | 3 ++- 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index dc0a1ebd8..229d036ed 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -26,25 +26,14 @@ jobs: key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - - name: Checkout OpenSearch - uses: actions/checkout@v2 - with: - repository: 'opensearch-project/OpenSearch' - path: OpenSearch - ref: '1.x' - - - name: Build OpenSearch - working-directory: ./OpenSearch - run: ./gradlew publishToMavenLocal - - - name: Checkout security + - name: Checkout security plugin uses: actions/checkout@v2 with: repository: 'opensearch-project/security' path: security ref: 'main' - - name: Package + - name: Build security plugin working-directory: ./security run: mvn -B clean package -Padvanced -DskipTests @@ -82,7 +71,7 @@ jobs: with: path: OpenSearch-Dashboards repository: opensearch-project/OpenSearch-Dashboards - ref: '1.x' + ref: '1.2' fetch-depth: 0 - name: Create plugins dir diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index fcdaf271e..5631f1e68 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -20,12 +20,13 @@ jobs: with: path: OpenSearch-Dashboards repository: opensearch-project/OpenSearch-Dashboards + ref: '1.2' fetch-depth: 0 - name: Create plugins dir run: | cd ./OpenSearch-Dashboards mkdir -p plugins - - name: Checkout + - name: Checkout OpenSearch Dashboard Security plugin uses: actions/checkout@v2 with: path: OpenSearch-Dashboards/plugins/security-dashboards-plugin diff --git a/release-notes/opensearch-security-dashboards-plugin.release-notes-1.2.0.0.md b/release-notes/opensearch-security-dashboards-plugin.release-notes-1.2.0.0.md index 85837bb76..386bd44bb 100644 --- a/release-notes/opensearch-security-dashboards-plugin.release-notes-1.2.0.0.md +++ b/release-notes/opensearch-security-dashboards-plugin.release-notes-1.2.0.0.md @@ -2,7 +2,7 @@ ### Enhancements * Add AD validate, multi-category results API cluster permissions ([#849](https://github.com/opensearch-project/security-dashboards-plugin/pull/849)) -* Add observability cluster permissions ([#851](https://github.com/opensearch-project/security-dashboards-plugin/pull/851)) +* Add observability cluster permissions ([#851](https://github.com/opensearch-project/security-dashboards-plugin/pull/851)) ### Maintenance * Removing default integtest.sh ([#829](https://github.com/opensearch-project/security-dashboards-plugin/pull/829)) @@ -11,3 +11,4 @@ * Update release note for 1.2 ([#853](https://github.com/opensearch-project/security-dashboards-plugin/pull/853)) * Updated copyright notices ([#847](https://github.com/opensearch-project/security-dashboards-plugin/pull/847)) * Updated release notes for 1.2 with copyright updates ([#856](https://github.com/opensearch-project/security-dashboards-plugin/pull/856)) +* Remove job building os core in integration test (#860) ([#863](https://github.com/opensearch-project/security-dashboards-plugin/pull/863)) \ No newline at end of file