From ffcf7143aae5f7620a81cf4988903f7fd8411eba Mon Sep 17 00:00:00 2001 From: Joshua Li Date: Tue, 1 Dec 2020 15:17:05 -0800 Subject: [PATCH 1/5] Fix path --- .github/workflows/reports-scheduler-release-workflow.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/reports-scheduler-release-workflow.yml b/.github/workflows/reports-scheduler-release-workflow.yml index 67cab319..c0429974 100644 --- a/.github/workflows/reports-scheduler-release-workflow.yml +++ b/.github/workflows/reports-scheduler-release-workflow.yml @@ -29,11 +29,10 @@ jobs: run: | cd reports-scheduler ./gradlew build buildDeb buildRpm --no-daemon --refresh-dependencies -Dbuild.snapshot=false - artifact=`ls ./reports-scheduler/build/distributions/*.zip` - rpm_artifact=`ls ./reports-scheduler/build/distributions/*.rpm` - deb_artifact=`ls ./reports-scheduler/build/distributions/*.deb` + artifact=`ls ./build/distributions/*.zip` + rpm_artifact=`ls ./build/distributions/*.rpm` + deb_artifact=`ls ./build/distributions/*.deb` - # TODO: rename S3 bucket path after infra team assigns one aws s3 cp $artifact s3://artifacts.opendistroforelasticsearch.amazon.com/downloads/elasticsearch-plugins/opendistro-reports-scheduler/ aws s3 cp $rpm_artifact s3://artifacts.opendistroforelasticsearch.amazon.com/downloads/rpms/opendistro-reports-scheduler/ aws s3 cp $deb_artifact s3://artifacts.opendistroforelasticsearch.amazon.com/downloads/debs/opendistro-reports-scheduler/ From 114804a68cd84f446b0a8e0a48c0788a6c915140 Mon Sep 17 00:00:00 2001 From: Joshua Li Date: Tue, 1 Dec 2020 15:21:42 -0800 Subject: [PATCH 2/5] Fix path for kibana reports --- .github/workflows/kibana-reports-release-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/kibana-reports-release-workflow.yml b/.github/workflows/kibana-reports-release-workflow.yml index bbb7b156..c96a3b0e 100644 --- a/.github/workflows/kibana-reports-release-workflow.yml +++ b/.github/workflows/kibana-reports-release-workflow.yml @@ -95,7 +95,7 @@ jobs: linux_artifact=`ls ./${{ env.PLUGIN_NAME }}-${{ env.OD_VERSION }}-linux-x64.zip` arm_artifact=`ls ./${{ env.PLUGIN_NAME }}-${{ env.OD_VERSION }}-linux-arm64.zip` - windows_artifact=`ls ./${{ env.PLUGIN_NAME }}-${{ env.OD_VERSION }}-windows.x64.zip` + windows_artifact=`ls ./${{ env.PLUGIN_NAME }}-${{ env.OD_VERSION }}-windows-x64.zip` aws s3 cp $linux_artifact s3://artifacts.opendistroforelasticsearch.amazon.com/downloads/kibana-plugins/opendistro-reports/ aws s3 cp $arm_artifact s3://artifacts.opendistroforelasticsearch.amazon.com/downloads/kibana-plugins/opendistro-reports/ From c5b7803e2f648bcd2cf6fdf5b663f6d951ddf270 Mon Sep 17 00:00:00 2001 From: Joshua Li Date: Tue, 1 Dec 2020 18:45:26 -0800 Subject: [PATCH 3/5] Change s3 bucket paths and artifact name --- .../kibana-reports-release-workflow.yml | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/kibana-reports-release-workflow.yml b/.github/workflows/kibana-reports-release-workflow.yml index c96a3b0e..4af8442a 100644 --- a/.github/workflows/kibana-reports-release-workflow.yml +++ b/.github/workflows/kibana-reports-release-workflow.yml @@ -68,36 +68,35 @@ jobs: cd build mkdir -p ./{linux-x64,linux-arm64,windows-x64}/kibana/${{ 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.OD_VERSION }}.zip + cp ./${{ env.PLUGIN_NAME }}-*.zip ./linux-arm64/${{ env.PLUGIN_NAME }}-${{ env.OD_VERSION }}.zip + mv ./${{ env.PLUGIN_NAME }}-*.zip ./windows-x64/${{ env.PLUGIN_NAME }}-${{ env.OD_VERSION }}.zip cd linux-x64 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 -d ./kibana/${{ env.PLUGIN_NAME }} + rm chromium-linux-x64.zip zip -ur ./${{ env.PLUGIN_NAME }}-*.zip ./kibana - mv ./${{ env.PLUGIN_NAME }}-*.zip .. + linux_artifact=`ls ./${{ env.PLUGIN_NAME }}-${{ env.OD_VERSION }}-linux-x64.zip` + aws s3 cp $linux_artifact s3://artifacts.opendistroforelasticsearch.amazon.com/downloads/kibana-plugins/opendistro-reports/linux/x64/ cd .. cd linux-arm64 wget https://github.com/opendistro-for-elasticsearch/kibana-reports/releases/download/chromium-1.12.0.0/chromium-linux-arm64.zip unzip chromium-linux-arm64.zip -d ./kibana/${{ env.PLUGIN_NAME }} + rm chromium-linux-arm64.zip zip -ur ./${{ env.PLUGIN_NAME }}-*.zip ./kibana - mv ./${{ env.PLUGIN_NAME }}-*.zip .. + arm_artifact=`ls ./${{ env.PLUGIN_NAME }}-${{ env.OD_VERSION }}-linux-arm64.zip` + aws s3 cp $arm_artifact s3://artifacts.opendistroforelasticsearch.amazon.com/downloads/kibana-plugins/opendistro-reports/linux/arm64/ cd .. cd windows-x64 wget https://github.com/opendistro-for-elasticsearch/kibana-reports/releases/download/chromium-1.12.0.0/chromium-windows-x64.zip unzip chromium-windows-x64.zip -d ./kibana/${{ env.PLUGIN_NAME }} + rm chromium-windows-x64.zip zip -ur ./${{ env.PLUGIN_NAME }}-*.zip ./kibana - mv ./${{ env.PLUGIN_NAME }}-*.zip .. - cd .. - - linux_artifact=`ls ./${{ env.PLUGIN_NAME }}-${{ env.OD_VERSION }}-linux-x64.zip` - arm_artifact=`ls ./${{ env.PLUGIN_NAME }}-${{ env.OD_VERSION }}-linux-arm64.zip` windows_artifact=`ls ./${{ env.PLUGIN_NAME }}-${{ env.OD_VERSION }}-windows-x64.zip` + aws s3 cp $windows_artifact s3://artifacts.opendistroforelasticsearch.amazon.com/downloads/kibana-plugins/opendistro-reports/windows/x64/ + cd .. - aws s3 cp $linux_artifact s3://artifacts.opendistroforelasticsearch.amazon.com/downloads/kibana-plugins/opendistro-reports/ - aws s3 cp $arm_artifact s3://artifacts.opendistroforelasticsearch.amazon.com/downloads/kibana-plugins/opendistro-reports/ - aws s3 cp $windows_artifact s3://artifacts.opendistroforelasticsearch.amazon.com/downloads/kibana-plugins/opendistro-reports/ aws cloudfront create-invalidation --distribution-id ${{ secrets.DISTRIBUTION_ID }} --paths "/downloads/*" From 0d720b26c4f01d5f25a198e9de591d22332da9b5 Mon Sep 17 00:00:00 2001 From: Joshua Li Date: Tue, 1 Dec 2020 19:15:10 -0800 Subject: [PATCH 4/5] Fix path --- .github/workflows/kibana-reports-release-workflow.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/kibana-reports-release-workflow.yml b/.github/workflows/kibana-reports-release-workflow.yml index 4af8442a..7088e1fe 100644 --- a/.github/workflows/kibana-reports-release-workflow.yml +++ b/.github/workflows/kibana-reports-release-workflow.yml @@ -77,7 +77,7 @@ jobs: unzip chromium-linux-x64.zip -d ./kibana/${{ env.PLUGIN_NAME }} rm chromium-linux-x64.zip zip -ur ./${{ env.PLUGIN_NAME }}-*.zip ./kibana - linux_artifact=`ls ./${{ env.PLUGIN_NAME }}-${{ env.OD_VERSION }}-linux-x64.zip` + linux_artifact=`ls ./${{ env.PLUGIN_NAME }}-${{ env.OD_VERSION }}.zip` aws s3 cp $linux_artifact s3://artifacts.opendistroforelasticsearch.amazon.com/downloads/kibana-plugins/opendistro-reports/linux/x64/ cd .. @@ -86,7 +86,7 @@ jobs: unzip chromium-linux-arm64.zip -d ./kibana/${{ env.PLUGIN_NAME }} rm chromium-linux-arm64.zip zip -ur ./${{ env.PLUGIN_NAME }}-*.zip ./kibana - arm_artifact=`ls ./${{ env.PLUGIN_NAME }}-${{ env.OD_VERSION }}-linux-arm64.zip` + arm_artifact=`ls ./${{ env.PLUGIN_NAME }}-${{ env.OD_VERSION }}.zip` aws s3 cp $arm_artifact s3://artifacts.opendistroforelasticsearch.amazon.com/downloads/kibana-plugins/opendistro-reports/linux/arm64/ cd .. @@ -95,7 +95,7 @@ jobs: unzip chromium-windows-x64.zip -d ./kibana/${{ env.PLUGIN_NAME }} rm chromium-windows-x64.zip zip -ur ./${{ env.PLUGIN_NAME }}-*.zip ./kibana - windows_artifact=`ls ./${{ env.PLUGIN_NAME }}-${{ env.OD_VERSION }}-windows-x64.zip` + windows_artifact=`ls ./${{ env.PLUGIN_NAME }}-${{ env.OD_VERSION }}.zip` aws s3 cp $windows_artifact s3://artifacts.opendistroforelasticsearch.amazon.com/downloads/kibana-plugins/opendistro-reports/windows/x64/ cd .. From bfaeb57d591fdac3ed5d688f6d1515dbb9409c4d Mon Sep 17 00:00:00 2001 From: Joshua Li Date: Wed, 2 Dec 2020 10:43:24 -0800 Subject: [PATCH 5/5] Use kibana-oss in release workflow --- .github/workflows/kibana-reports-release-workflow.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/kibana-reports-release-workflow.yml b/.github/workflows/kibana-reports-release-workflow.yml index 7088e1fe..c4efa905 100644 --- a/.github/workflows/kibana-reports-release-workflow.yml +++ b/.github/workflows/kibana-reports-release-workflow.yml @@ -27,8 +27,9 @@ jobs: - name: Checkout Kibana uses: actions/checkout@v1 with: - repository: elastic/kibana - ref: v7.10.0 + repository: opendistro-for-elasticsearch/kibana-oss + ref: 7.10.0 + token: ${{secrets.OD_ACCESS}} path: kibana-reports/kibana - name: Setup Node