From db652bfa09b6a7046b2cb2b59ce8b7ac55a12cc7 Mon Sep 17 00:00:00 2001 From: Zhongnan Su Date: Tue, 27 Apr 2021 11:10:09 -0700 Subject: [PATCH 1/3] finalize beta 1 release code change --- .../dashboards-reports-release-workflow.yml | 14 +++++++------- ...ashboards-reports-test-and-build-workflow.yml | 16 ++++++++-------- ...reports-scheduler-test-and-build-workflow.yml | 12 +++++++----- reports-scheduler/build.gradle | 4 ++-- 4 files changed, 24 insertions(+), 22 deletions(-) diff --git a/.github/workflows/dashboards-reports-release-workflow.yml b/.github/workflows/dashboards-reports-release-workflow.yml index f19ede7b..763bb6fc 100644 --- a/.github/workflows/dashboards-reports-release-workflow.yml +++ b/.github/workflows/dashboards-reports-release-workflow.yml @@ -7,7 +7,7 @@ on: env: PLUGIN_NAME: reportsDashboards - OD_VERSION: 1.0.0.0 + OPENSEARCH_VERSION: 1.0.0.0-beta1 jobs: build: @@ -68,9 +68,9 @@ jobs: cd build mkdir -p ./{linux-x64,linux-arm64,windows-x64}/OpenSearch-Dashboards/${{ env.PLUGIN_NAME }} - cp ./${{ env.PLUGIN_NAME }}-*.zip ./linux-x64/${{ env.PLUGIN_NAME }}-${{ env.OD_VERSION }}-linux-x64.zip - cp ./${{ env.PLUGIN_NAME }}-*.zip ./linux-arm64/${{ env.PLUGIN_NAME }}-${{ env.OD_VERSION }}-linux-arm64.zip - mv ./${{ env.PLUGIN_NAME }}-*.zip ./windows-x64/${{ env.PLUGIN_NAME }}-${{ env.OD_VERSION }}-windows-x64.zip + cp ./${{ env.PLUGIN_NAME }}-*.zip ./linux-x64/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_VERSION }}-linux-x64.zip + cp ./${{ env.PLUGIN_NAME }}-*.zip ./linux-arm64/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_VERSION }}-linux-arm64.zip + mv ./${{ env.PLUGIN_NAME }}-*.zip ./windows-x64/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_VERSION }}-windows-x64.zip s3_prefix="s3://staging.artifacts.opendistroforelasticsearch.amazon.com/snapshots/kibana-plugins/reports/" @@ -79,7 +79,7 @@ jobs: unzip chromium-linux-x64.zip -d ./OpenSearch-Dashboards/${{ env.PLUGIN_NAME }} rm chromium-linux-x64.zip zip -ur ./${{ env.PLUGIN_NAME }}-*.zip ./OpenSearch-Dashboards - linux_x64_artifact=`ls ./${{ env.PLUGIN_NAME }}-${{ env.OD_VERSION }}-linux-x64.zip` + linux_x64_artifact=`ls ./${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_VERSION }}-linux-x64.zip` #Inject build number before the suffix and upload to S3 linux_x64_artifact_outfile=`basename ${linux_x64_artifact%.zip}-build-${GITHUB_RUN_NUMBER}.zip` @@ -92,7 +92,7 @@ jobs: unzip chromium-linux-arm64.zip -d ./OpenSearch-Dashboards/${{ env.PLUGIN_NAME }} rm chromium-linux-arm64.zip zip -ur ./${{ env.PLUGIN_NAME }}-*.zip ./OpenSearch-Dashboards - linux_arm64_artifact=`ls ./${{ env.PLUGIN_NAME }}-${{ env.OD_VERSION }}-linux-arm64.zip` + linux_arm64_artifact=`ls ./${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_VERSION }}-linux-arm64.zip` #Inject build number before the suffix and upload to S3 linux_arm64_artifact_outfile=`basename ${linux_arm64_artifact%.zip}-build-${GITHUB_RUN_NUMBER}.zip` @@ -105,7 +105,7 @@ jobs: unzip chromium-windows-x64.zip -d ./OpenSearch-Dashboards/${{ env.PLUGIN_NAME }} rm chromium-windows-x64.zip zip -ur ./${{ env.PLUGIN_NAME }}-*.zip ./OpenSearch-Dashboards - windows_x64_artifact=`ls ./${{ env.PLUGIN_NAME }}-${{ env.OD_VERSION }}-windows-x64.zip` + windows_x64_artifact=`ls ./${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_VERSION }}-windows-x64.zip` #Inject build number before the suffix and upload to S3 windows_x64_artifact_outfile=`basename ${windows_x64_artifact%.zip}-build-${GITHUB_RUN_NUMBER}.zip` diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml index 390dd0f1..f013b50f 100644 --- a/.github/workflows/dashboards-reports-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-reports-test-and-build-workflow.yml @@ -4,7 +4,7 @@ on: [pull_request, push] env: PLUGIN_NAME: reportsDashboards - OD_VERSION: 1.0.0.0 + OPENSEARCH_VERSION: 1.0.0.0-beta1 jobs: build: @@ -32,7 +32,7 @@ jobs: run: | sudo apt install -y libnss3-dev fonts-liberation libfontconfig1 cd OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} - wget https://github.com/opendistro-for-elasticsearch/kibana-reports/releases/download/chromium-1.12.0.0/chromium-linux-x64.zip + wget https://github.com/opendistro-for-elasticsearch/kibana-reports/releases/download/chromium-1.12.0.0/chromium-linux-x64.zip unzip chromium-linux-x64.zip rm chromium-linux-x64.zip @@ -57,9 +57,9 @@ jobs: cd build mkdir -p ./{linux-x64,linux-arm64,windows-x64}/OpenSearch-Dashboards/${{ env.PLUGIN_NAME }} - cp ./${{ env.PLUGIN_NAME }}-*.zip ./linux-x64/${{ env.PLUGIN_NAME }}-${{ env.OD_VERSION }}-linux-x64.zip - cp ./${{ env.PLUGIN_NAME }}-*.zip ./linux-arm64/${{ env.PLUGIN_NAME }}-${{ env.OD_VERSION }}-linux-arm64.zip - mv ./${{ env.PLUGIN_NAME }}-*.zip ./windows-x64/${{ env.PLUGIN_NAME }}-${{ env.OD_VERSION }}-windows-x64.zip + cp ./${{ env.PLUGIN_NAME }}-*.zip ./linux-x64/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_VERSION }}-linux-x64.zip + cp ./${{ env.PLUGIN_NAME }}-*.zip ./linux-arm64/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_VERSION }}-linux-arm64.zip + mv ./${{ env.PLUGIN_NAME }}-*.zip ./windows-x64/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_VERSION }}-windows-x64.zip cd linux-x64 wget https://github.com/opendistro-for-elasticsearch/kibana-reports/releases/download/chromium-1.12.0.0/chromium-linux-x64.zip @@ -86,16 +86,16 @@ jobs: uses: actions/upload-artifact@v1 with: name: dashboards-reports-linux-x64 - path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}/build/${{ env.PLUGIN_NAME }}-${{ env.OD_VERSION }}-linux-x64.zip + path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}/build/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_VERSION }}-linux-x64.zip - name: Upload Artifact For Linux arm64 uses: actions/upload-artifact@v1 with: name: dashboards-reports-linux-arm64 - path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}/build/${{ env.PLUGIN_NAME }}-${{ env.OD_VERSION }}-linux-arm64.zip + path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}/build/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_VERSION }}-linux-arm64.zip - name: Upload Artifact For Windows uses: actions/upload-artifact@v1 with: name: dashboards-reports-windows-x64 - path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}/build/${{ env.PLUGIN_NAME }}-${{ env.OD_VERSION }}-windows-x64.zip + path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}/build/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_VERSION }}-windows-x64.zip diff --git a/.github/workflows/reports-scheduler-test-and-build-workflow.yml b/.github/workflows/reports-scheduler-test-and-build-workflow.yml index bb635018..082f622c 100644 --- a/.github/workflows/reports-scheduler-test-and-build-workflow.yml +++ b/.github/workflows/reports-scheduler-test-and-build-workflow.yml @@ -18,30 +18,32 @@ jobs: with: repository: 'opensearch-project/OpenSearch' path: OpenSearch - ref: '1.0.0-alpha2' + ref: '1.0.0-beta1' - name: Build OpenSearch working-directory: ./OpenSearch - run: ./gradlew publishToMavenLocal -Dbuild.version_qualifier=alpha2 -Dbuild.snapshot=false + run: ./gradlew publishToMavenLocal -Dbuild.version_qualifier=beta1 -Dbuild.snapshot=false # dependencies: common-utils - name: Checkout common-utils uses: actions/checkout@v2 with: repository: 'opensearch-project/common-utils' + ref: '1.0.0-beta1' path: common-utils - name: Build common-utils working-directory: ./common-utils - run: ./gradlew publishToMavenLocal -Dopensearch.version=1.0.0-alpha2 + run: ./gradlew publishToMavenLocal -Dopensearch.version=1.0.0-beta1 # dependencies: job-scheduler - name: Checkout job-scheduler uses: actions/checkout@v2 with: repository: 'opensearch-project/job-scheduler' + ref: '1.0.0-beta1' path: job-scheduler - name: Build job-scheduler working-directory: ./job-scheduler - run: ./gradlew publishToMavenLocal -Dopensearch.version=1.0.0-alpha2 -Dbuild.snapshot=false + run: ./gradlew publishToMavenLocal -Dopensearch.version=1.0.0-beta1 -Dbuild.snapshot=false # reports-scheduler - name: Checkout Reports Scheduler @@ -50,7 +52,7 @@ jobs: - name: Build with Gradle run: | cd reports-scheduler - ./gradlew build -Dopensearch.version=1.0.0-alpha2 + ./gradlew build -Dopensearch.version=1.0.0-beta1 - name: Create Artifact Path run: | diff --git a/reports-scheduler/build.gradle b/reports-scheduler/build.gradle index 66da35e6..12a0d819 100644 --- a/reports-scheduler/build.gradle +++ b/reports-scheduler/build.gradle @@ -30,7 +30,7 @@ import java.util.concurrent.Callable buildscript { ext { opensearch_group = "org.opensearch" - opensearch_version = System.getProperty("opensearch.version", "1.0.0-alpha2") + opensearch_version = System.getProperty("opensearch.version", "1.0.0-beta1") kotlin_version = System.getProperty("kotlin.version", "1.4.0") } @@ -107,7 +107,7 @@ ext { licenseFile = rootProject.file('LICENSE.txt') noticeFile = rootProject.file('NOTICE.txt') isSnapshot = "true" == System.getProperty("build.snapshot", "true") - opensearchVersion = "${version}.0-alpha2" + opensearchVersion = "${version}.0-beta1" } if (isSnapshot) { From 4afa75eea52e962a954eb9442340d7ba0d6d2326 Mon Sep 17 00:00:00 2001 From: Zhongnan Su Date: Tue, 27 Apr 2021 11:44:12 -0700 Subject: [PATCH 2/3] update dashboards version to 1.0.0.0-beta1 --- dashboards-reports/opensearch_dashboards.json | 4 ++-- dashboards-reports/package.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dashboards-reports/opensearch_dashboards.json b/dashboards-reports/opensearch_dashboards.json index 02216b97..f71795fd 100644 --- a/dashboards-reports/opensearch_dashboards.json +++ b/dashboards-reports/opensearch_dashboards.json @@ -1,7 +1,7 @@ { "id": "reportsDashboards", - "version": "1.0.0.0", - "opensearchDashboardsVersion": "1.0.0", + "version": "1.0.0.0-beta1", + "opensearchDashboardsVersion": "1.0.0-beta1", "requiredPlugins": ["navigation", "data"], "optionalPlugins": ["share"], "server": true, diff --git a/dashboards-reports/package.json b/dashboards-reports/package.json index edcd4b48..809048c4 100644 --- a/dashboards-reports/package.json +++ b/dashboards-reports/package.json @@ -1,12 +1,12 @@ { "name": "reports_dashboards", - "version": "1.0.0.0", + "version": "1.0.0.0-beta1", "description": "OpenSearch Dashboards Reports Plugin", "license": "Apache-2.0", "main": "index.ts", "opensearchDashboards": { - "version": "1.0.0", - "templateVersion": "1.0.0" + "version": "1.0.0-beta1", + "templateVersion": "1.0.0-beta1" }, "scripts": { "osd": "node ../../scripts/osd", From 8d442f5f64928642105ea3d7337b663a4b85f237 Mon Sep 17 00:00:00 2001 From: Zhongnan Su Date: Tue, 27 Apr 2021 12:52:35 -0700 Subject: [PATCH 3/3] fix workflow upstream version --- .../dashboards-reports-release-workflow.yml | 17 +++++++++-------- ...shboards-reports-test-and-build-workflow.yml | 17 +++++++++-------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/.github/workflows/dashboards-reports-release-workflow.yml b/.github/workflows/dashboards-reports-release-workflow.yml index 763bb6fc..d32bcb07 100644 --- a/.github/workflows/dashboards-reports-release-workflow.yml +++ b/.github/workflows/dashboards-reports-release-workflow.yml @@ -7,7 +7,8 @@ on: env: PLUGIN_NAME: reportsDashboards - OPENSEARCH_VERSION: 1.0.0.0-beta1 + OPENSEARCH_VERSION: 1.0.0-beta1 + OPENSEARCH_PLUGIN_VERSION: 1.0.0.0-beta1 jobs: build: @@ -28,7 +29,7 @@ jobs: uses: actions/checkout@v1 with: repository: opensearch-project/Opensearch-Dashboards - ref: main + ref: ${{ env.OPENSEARCH_VERSION }} path: dashboards-reports/OpenSearch-Dashboards - name: Setup Node @@ -68,9 +69,9 @@ jobs: cd build mkdir -p ./{linux-x64,linux-arm64,windows-x64}/OpenSearch-Dashboards/${{ env.PLUGIN_NAME }} - cp ./${{ env.PLUGIN_NAME }}-*.zip ./linux-x64/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_VERSION }}-linux-x64.zip - cp ./${{ env.PLUGIN_NAME }}-*.zip ./linux-arm64/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_VERSION }}-linux-arm64.zip - mv ./${{ env.PLUGIN_NAME }}-*.zip ./windows-x64/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_VERSION }}-windows-x64.zip + cp ./${{ env.PLUGIN_NAME }}-*.zip ./linux-x64/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-linux-x64.zip + cp ./${{ env.PLUGIN_NAME }}-*.zip ./linux-arm64/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-linux-arm64.zip + mv ./${{ env.PLUGIN_NAME }}-*.zip ./windows-x64/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-windows-x64.zip s3_prefix="s3://staging.artifacts.opendistroforelasticsearch.amazon.com/snapshots/kibana-plugins/reports/" @@ -79,7 +80,7 @@ jobs: unzip chromium-linux-x64.zip -d ./OpenSearch-Dashboards/${{ env.PLUGIN_NAME }} rm chromium-linux-x64.zip zip -ur ./${{ env.PLUGIN_NAME }}-*.zip ./OpenSearch-Dashboards - linux_x64_artifact=`ls ./${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_VERSION }}-linux-x64.zip` + linux_x64_artifact=`ls ./${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-linux-x64.zip` #Inject build number before the suffix and upload to S3 linux_x64_artifact_outfile=`basename ${linux_x64_artifact%.zip}-build-${GITHUB_RUN_NUMBER}.zip` @@ -92,7 +93,7 @@ jobs: unzip chromium-linux-arm64.zip -d ./OpenSearch-Dashboards/${{ env.PLUGIN_NAME }} rm chromium-linux-arm64.zip zip -ur ./${{ env.PLUGIN_NAME }}-*.zip ./OpenSearch-Dashboards - linux_arm64_artifact=`ls ./${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_VERSION }}-linux-arm64.zip` + linux_arm64_artifact=`ls ./${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-linux-arm64.zip` #Inject build number before the suffix and upload to S3 linux_arm64_artifact_outfile=`basename ${linux_arm64_artifact%.zip}-build-${GITHUB_RUN_NUMBER}.zip` @@ -105,7 +106,7 @@ jobs: unzip chromium-windows-x64.zip -d ./OpenSearch-Dashboards/${{ env.PLUGIN_NAME }} rm chromium-windows-x64.zip zip -ur ./${{ env.PLUGIN_NAME }}-*.zip ./OpenSearch-Dashboards - windows_x64_artifact=`ls ./${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_VERSION }}-windows-x64.zip` + windows_x64_artifact=`ls ./${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-windows-x64.zip` #Inject build number before the suffix and upload to S3 windows_x64_artifact_outfile=`basename ${windows_x64_artifact%.zip}-build-${GITHUB_RUN_NUMBER}.zip` diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml index f013b50f..bbbb24cd 100644 --- a/.github/workflows/dashboards-reports-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-reports-test-and-build-workflow.yml @@ -4,7 +4,8 @@ on: [pull_request, push] env: PLUGIN_NAME: reportsDashboards - OPENSEARCH_VERSION: 1.0.0.0-beta1 + OPENSEARCH_VERSION: 1.0.0-beta1 + OPENSEARCH_PLUGIN_VERSION: 1.0.0.0-beta1 jobs: build: @@ -17,7 +18,7 @@ jobs: uses: actions/checkout@v1 with: repository: opensearch-project/Opensearch-Dashboards - ref: main + ref: ${{ env.OPENSEARCH_VERSION }} path: dashboards-reports/OpenSearch-Dashboards - name: Setup Node @@ -57,9 +58,9 @@ jobs: cd build mkdir -p ./{linux-x64,linux-arm64,windows-x64}/OpenSearch-Dashboards/${{ env.PLUGIN_NAME }} - cp ./${{ env.PLUGIN_NAME }}-*.zip ./linux-x64/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_VERSION }}-linux-x64.zip - cp ./${{ env.PLUGIN_NAME }}-*.zip ./linux-arm64/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_VERSION }}-linux-arm64.zip - mv ./${{ env.PLUGIN_NAME }}-*.zip ./windows-x64/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_VERSION }}-windows-x64.zip + cp ./${{ env.PLUGIN_NAME }}-*.zip ./linux-x64/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-linux-x64.zip + cp ./${{ env.PLUGIN_NAME }}-*.zip ./linux-arm64/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-linux-arm64.zip + mv ./${{ env.PLUGIN_NAME }}-*.zip ./windows-x64/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-windows-x64.zip cd linux-x64 wget https://github.com/opendistro-for-elasticsearch/kibana-reports/releases/download/chromium-1.12.0.0/chromium-linux-x64.zip @@ -86,16 +87,16 @@ jobs: uses: actions/upload-artifact@v1 with: name: dashboards-reports-linux-x64 - path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}/build/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_VERSION }}-linux-x64.zip + path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}/build/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-linux-x64.zip - name: Upload Artifact For Linux arm64 uses: actions/upload-artifact@v1 with: name: dashboards-reports-linux-arm64 - path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}/build/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_VERSION }}-linux-arm64.zip + path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}/build/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-linux-arm64.zip - name: Upload Artifact For Windows uses: actions/upload-artifact@v1 with: name: dashboards-reports-windows-x64 - path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}/build/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_VERSION }}-windows-x64.zip + path: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}/build/${{ env.PLUGIN_NAME }}-${{ env.OPENSEARCH_PLUGIN_VERSION }}-windows-x64.zip