From 445a0ade25f1fdfe8ed883b503d77a60a04d3666 Mon Sep 17 00:00:00 2001 From: Eli Battat Date: Mon, 28 Aug 2023 22:01:45 +0300 Subject: [PATCH] fix grafana job --- .bumpversion.cfg | 2 +- .github/workflows/Nightly_Perf_Env_CI.yml | 5 ++++- .github/workflows/Perf_Env_Build_Test_CI.yml | 5 ++++- ...bsonnet_versions.py => update_versions_main_libsonnet.py} | 0 setup.py | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) rename benchmark_runner/grafana/{update_main_libsonnet_versions.py => update_versions_main_libsonnet.py} (100%) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index ba02511b8..e8d3518fb 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,7 +1,7 @@ [bumpversion] commit = False tag = True -current_version = 1.0.508 +current_version = 1.0.509 tag_name = v{current_version} message = GitHub Actions Build {current_version} diff --git a/.github/workflows/Nightly_Perf_Env_CI.yml b/.github/workflows/Nightly_Perf_Env_CI.yml index 22f025971..8d5b76c07 100644 --- a/.github/workflows/Nightly_Perf_Env_CI.yml +++ b/.github/workflows/Nightly_Perf_Env_CI.yml @@ -321,6 +321,9 @@ jobs: name: update_grafana_dashboard needs: [ initialize_nightly, workload, finalize_nightly ] runs-on: ubuntu-latest + strategy: + matrix: + python-version: [ '3.10' ] steps: - name: Checkout repository uses: actions/checkout@v3 @@ -337,7 +340,7 @@ jobs: ELASTICSEARCH_USER: ${{ secrets.PERF_ELASTICSEARCH_USER }} ELASTICSEARCH_PASSWORD: ${{ secrets.PERF_ELASTICSEARCH_PASSWORD }} run: | - python "$GITHUB_WORKSPACE"/grafonnet_generator/grafana/update_versions_main_libsonnet.py + python "$GITHUB_WORKSPACE"/benchmark_runner/grafana/update_versions_main_libsonnet.py - name: Generate grafana dashboard.json using grafonnet container run: | diff --git a/.github/workflows/Perf_Env_Build_Test_CI.yml b/.github/workflows/Perf_Env_Build_Test_CI.yml index f937326a6..558098c07 100644 --- a/.github/workflows/Perf_Env_Build_Test_CI.yml +++ b/.github/workflows/Perf_Env_Build_Test_CI.yml @@ -269,6 +269,9 @@ jobs: name: update_grafana_dashboard needs: [ unittest, integration_test, pypi_upload, pypi_validate, quay_upload ] runs-on: ubuntu-latest + strategy: + matrix: + python-version: [ '3.10' ] steps: - name: Checkout repository uses: actions/checkout@v3 @@ -285,7 +288,7 @@ jobs: ELASTICSEARCH_USER: ${{ secrets.PERF_ELASTICSEARCH_USER }} ELASTICSEARCH_PASSWORD: ${{ secrets.PERF_ELASTICSEARCH_PASSWORD }} run: | - python "$GITHUB_WORKSPACE"/grafonnet_generator/grafana/update_versions_main_libsonnet.py + python "$GITHUB_WORKSPACE"/benchmark_runner/grafana/update_versions_main_libsonnet.py - name: Generate grafana dashboard.json using grafonnet container run: | diff --git a/benchmark_runner/grafana/update_main_libsonnet_versions.py b/benchmark_runner/grafana/update_versions_main_libsonnet.py similarity index 100% rename from benchmark_runner/grafana/update_main_libsonnet_versions.py rename to benchmark_runner/grafana/update_versions_main_libsonnet.py diff --git a/setup.py b/setup.py index 3a2f117a9..6baff8bce 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from setuptools import setup, find_packages -__version__ = '1.0.508' +__version__ = '1.0.509' here = path.abspath(path.dirname(__file__))