diff --git a/.github/workflows/beam_Metrics_Report.yml b/.github/workflows/beam_Metrics_Report.yml index 9c4a540e7ef0..1502c1fa326c 100644 --- a/.github/workflows/beam_Metrics_Report.yml +++ b/.github/workflows/beam_Metrics_Report.yml @@ -18,10 +18,8 @@ name: Beam Metrics Report on: - # issue_comment: - # types: [created] - # schedule: - # - cron: '0 */23 * * *' + schedule: + - cron: '0 11 * * 2' workflow_dispatch: # This allows a subsequently queued workflow run to interrupt previous runs @@ -52,26 +50,15 @@ permissions: jobs: beam_Metrics_Report: - name: ${{matrix.job_name}} (${{matrix.job_phrase}}) + name: beam_Metrics_Report runs-on: [self-hosted, ubuntu-20.04, main] timeout-minutes: 100 - strategy: - matrix: - job_name: [beam_Metrics_Report] - job_phrase: [Run Metrics Report] if: | (github.event_name == 'schedule' || - github.event_name == 'workflow_dispatch' || - github.event.comment.body == 'Run Metrics Report') && + github.event_name == 'workflow_dispatch') && github.repository == 'apache/beam' steps: - uses: actions/checkout@v3 - - name: Setup repository - uses: ./.github/actions/setup-action - with: - comment_phrase: ${{ matrix.job_phrase }} - github_token: ${{ secrets.GITHUB_TOKEN }} - github_job: ${{ matrix.job_name }} (${{ matrix.job_phrase }}) - name: Setup environment uses: ./.github/actions/setup-environment-action with: @@ -102,7 +89,6 @@ jobs: username: ${{ secrets.ISSUE_REPORT_SENDER_EMAIL_ADDRESS }} password: ${{ secrets.ISSUE_REPORT_SENDER_EMAIL_PASSWORD }} subject: Beam Metrics Report ${{ env.date }} - to: dannymccormick@google.com #dev@beam.apache.org - cc: vlado.djerek@akvelon.com - from: gactions@beam.apache.org # + to: dev@beam.apache.org + from: beamactions@gmail.com html_body: file://${{ github.workspace }}/.test-infra/jenkins/metrics_report/beam-metrics_report.html diff --git a/.test-infra/jenkins/job_Metrics_Report.groovy b/.test-infra/jenkins/job_Metrics_Report.groovy deleted file mode 100644 index d1d358221213..000000000000 --- a/.test-infra/jenkins/job_Metrics_Report.groovy +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import CommonJobProperties as commonJobProperties -import InfluxDBCredentialsHelper - -job('beam_Metrics_Report') { - description('Runs Beam metrics report.') - - // Set common parameters. - commonJobProperties.setTopLevelMainJobProperties( - delegate, 'master', 100, true, 'beam', false) - InfluxDBCredentialsHelper.useCredentials(delegate) - - def influxDb = InfluxDBCredentialsHelper.InfluxDBDatabaseName - def influxHost = InfluxDBCredentialsHelper.InfluxDBHost - def influxPort = InfluxDBCredentialsHelper.InfluxDBPort - - // Allows triggering this build against pull requests. - commonJobProperties.enablePhraseTriggeringFromPullRequest( - delegate, - 'Beam Metrics Report', - 'Run Metrics Report', - false - ) - - commonJobProperties.setAutoJob( - delegate, - '@weekly') - - steps { - gradle { - rootBuildScriptDir(commonJobProperties.checkoutDir) - commonJobProperties.setGradleSwitches(delegate) - switches("-PinfluxDb=${influxDb}") - switches("-PinfluxHost=${influxHost}") - switches("-PinfluxPort=${influxPort}") - tasks(':beam-test-jenkins:generateMetricsReport') - } - } - - def date = new Date().format('yyyy-MM-dd') - publishers { - extendedEmail { - triggers { - always { - recipientList('dev@beam.apache.org') - contentType('text/html') - subject("Beam Metrics Report (${date})") - content('''${FILE, path="src/.test-infra/jenkins/metrics_report/beam-metrics_report.html"}''') - } - } - } - archiveArtifacts { - pattern('src/.test-infra/jenkins/metrics_report/beam-metrics_report.html') - onlyIfSuccessful() - } - wsCleanup { - excludePattern('src/.test-infra/jenkins/metrics_report/beam-metrics_report.html') - } - } -}