From 08fbcd1c27ed0044304ce9c7202764182c9d03f7 Mon Sep 17 00:00:00 2001 From: Maximilian Hoffman Date: Wed, 14 Dec 2022 11:35:04 -0800 Subject: [PATCH] use different template for sysbench tests (#4991) --- .github/actions/ses-email-action/action.yaml | 8 ++++++++ .github/actions/ses-email-action/index.js | 5 +++++ .github/workflows/import-perf.yaml | 6 ++---- .github/workflows/sysbench-perf.yaml | 6 ++---- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/.github/actions/ses-email-action/action.yaml b/.github/actions/ses-email-action/action.yaml index 63d8534685..3cc017df59 100644 --- a/.github/actions/ses-email-action/action.yaml +++ b/.github/actions/ses-email-action/action.yaml @@ -21,6 +21,14 @@ inputs: required: false description: 'path to email data file' default: '' + bodyPath: + required: false + description: 'path to email body file' + default: '' + subject: + required: false + description: 'path to email subject' + default: '' toAddresses: description: 'json string list of to addresses' required: true diff --git a/.github/actions/ses-email-action/index.js b/.github/actions/ses-email-action/index.js index 8c1606473f..7c6ee95a5a 100644 --- a/.github/actions/ses-email-action/index.js +++ b/.github/actions/ses-email-action/index.js @@ -11,14 +11,19 @@ const CcAddresses = JSON.parse(core.getInput('ccAddresses')); const ToAddresses = JSON.parse(core.getInput('toAddresses')); const ReplyToAddresses = JSON.parse(core.getInput('replyToAddresses')); const workflowURL = core.getInput('workflowURL'); +const subject = core.getInput('subject'); +const bodyPath = core.getInput('bodyPath'); const data = dataFilePath ? fs.readFileSync(dataFilePath, { encoding: 'utf-8' }) : ""; +const body = bodyPath ? fs.readFileSync(bodyPath, { encoding: 'utf-8' }) : ""; const templated = { version, format, results: data, workflowURL, + subject, + body, }; // Set the region diff --git a/.github/workflows/import-perf.yaml b/.github/workflows/import-perf.yaml index b4ef628b1b..6cd960c222 100644 --- a/.github/workflows/import-perf.yaml +++ b/.github/workflows/import-perf.yaml @@ -139,11 +139,9 @@ jobs: with: region: us-west-2 toAddresses: '["${{ github.event.client_payload.email_recipient }}"]' - version: ${{ steps.version.outputs.ref }} - format: '__DOLT__' - dataFile: ${{ steps.html.outputs.html }} + subject: 'Import Performance Benchmarks: ${{ github.event.client_payload.version }}' + bodyPath: ${{ steps.html.outputs.html }} template: 'SysbenchTemplate' - category: 'Import' - name: Read CSV if: ${{ github.event.client_payload.issue_id }} != "" diff --git a/.github/workflows/sysbench-perf.yaml b/.github/workflows/sysbench-perf.yaml index 50dea1eed7..99fb88cde3 100644 --- a/.github/workflows/sysbench-perf.yaml +++ b/.github/workflows/sysbench-perf.yaml @@ -140,11 +140,9 @@ jobs: with: region: us-west-2 toAddresses: '["${{ github.event.client_payload.email_recipient }}"]' - version: ${{ github.event.client_payload.version }} - format: '__DOLT__' - dataFile: ${{ steps.html.outputs.html }} + subject: 'System Table Performance Benchmarks: ${{ github.event.client_payload.version }}' + bodyPath: ${{ steps.html.outputs.html }} template: 'SysbenchTemplate' - category: 'Sysbench' - name: Read CSV if: ${{ github.event.client_payload.issue_id }} != ""