From c32c6702356e984b4cea284f90cd5b3f4f678dad Mon Sep 17 00:00:00 2001 From: Eric Sauer Date: Wed, 25 Sep 2024 13:15:19 +0000 Subject: [PATCH 1/2] Update all non-CD actions to run against main branch Signed-off-by: Eric Sauer --- .github/workflows/chart-lint.yml | 4 ++-- .github/workflows/check-python-dependencies.yml | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/conftest.yml | 4 ++-- .github/workflows/doc-check.yml | 2 +- .github/workflows/mockoon-tests.yml | 4 ++-- .github/workflows/pre-commit-test.yml | 4 ++-- .github/workflows/prometheus-rules.yml | 4 ++-- .github/workflows/python-formatting.yml | 2 +- .github/workflows/python-linting.yml | 2 +- .github/workflows/shellcheck.yml | 4 ++-- .github/workflows/trigger-test-images.yml | 2 +- .github/workflows/typecheck.yml | 4 ++-- .github/workflows/unittests.yml | 4 ++-- 14 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/chart-lint.yml b/.github/workflows/chart-lint.yml index 880f7e6bc..653e301d2 100644 --- a/.github/workflows/chart-lint.yml +++ b/.github/workflows/chart-lint.yml @@ -1,7 +1,7 @@ name: Chart Lint on: push: - branches: [ master ] + branches: [ main ] paths: - 'exporters/**' - 'charts/**' @@ -11,7 +11,7 @@ on: - 'Makefile' pull_request: - branches: [ master ] + branches: [ main ] paths: - 'exporters/**' - 'charts/**' diff --git a/.github/workflows/check-python-dependencies.yml b/.github/workflows/check-python-dependencies.yml index cbc3edbb5..35cde4484 100644 --- a/.github/workflows/check-python-dependencies.yml +++ b/.github/workflows/check-python-dependencies.yml @@ -1,7 +1,7 @@ name: Check Python dependencies on: pull_request: - branches: [ master ] + branches: [ main ] paths: - 'pyproject.toml' - 'poetry.lock' diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 01bcb6001..1b561ee02 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,7 +2,7 @@ name: Continuos Integration on: pull_request: - branches: [ master ] + branches: [ main ] paths: - '.github/workflows/ci.yml' schedule: diff --git a/.github/workflows/conftest.yml b/.github/workflows/conftest.yml index 47f659e81..23dc21e52 100644 --- a/.github/workflows/conftest.yml +++ b/.github/workflows/conftest.yml @@ -2,7 +2,7 @@ name: Conftest on: push: - branches: [ master ] + branches: [ main ] paths: - '_test/**' - 'charts/**' @@ -10,7 +10,7 @@ on: - 'Makefile' pull_request: - branches: [ master ] + branches: [ main ] paths: - '_test/**' - 'charts/**' diff --git a/.github/workflows/doc-check.yml b/.github/workflows/doc-check.yml index 38c747548..d1d0fe242 100644 --- a/.github/workflows/doc-check.yml +++ b/.github/workflows/doc-check.yml @@ -1,7 +1,7 @@ name: Documentation check on: pull_request: - branches: [ master ] + branches: [ main ] paths: - 'docs/**' - '.github/workflows/doc-check.yml' diff --git a/.github/workflows/mockoon-tests.yml b/.github/workflows/mockoon-tests.yml index e0f8c04bc..15338d11c 100644 --- a/.github/workflows/mockoon-tests.yml +++ b/.github/workflows/mockoon-tests.yml @@ -1,7 +1,7 @@ name: Mockoon Tests on: push: - branches: [ master ] + branches: [ main ] paths: - 'exporters/**' - 'mocks/**' @@ -11,7 +11,7 @@ on: - 'scripts/run-mockoon-tests.sh' pull_request: - branches: [ master ] + branches: [ main ] paths: - 'exporters/**' - 'mocks/**' diff --git a/.github/workflows/pre-commit-test.yml b/.github/workflows/pre-commit-test.yml index 358007150..e546fa143 100644 --- a/.github/workflows/pre-commit-test.yml +++ b/.github/workflows/pre-commit-test.yml @@ -2,14 +2,14 @@ name: Pre-commit test on: push: - branches: [ master ] + branches: [ main ] paths: - '.pre-commit-config.yaml' - '.github/workflows/pre-commit-test.yml' - 'Makefile' pull_request: - branches: [ master ] + branches: [ main ] paths: - '.pre-commit-config.yaml' - '.github/workflows/pre-commit-test.yml' diff --git a/.github/workflows/prometheus-rules.yml b/.github/workflows/prometheus-rules.yml index c00f4f69a..b70ce78ab 100644 --- a/.github/workflows/prometheus-rules.yml +++ b/.github/workflows/prometheus-rules.yml @@ -1,14 +1,14 @@ name: Prometheus Rules Tests on: push: - branches: [ master ] + branches: [ main ] paths: - '_test/**' - 'charts/pelorus/**' - '.github/workflows/prometheus-rules.yml' pull_request: - branches: [ master ] + branches: [ main ] paths: - '_test/**' - 'charts/pelorus/**' diff --git a/.github/workflows/python-formatting.yml b/.github/workflows/python-formatting.yml index 1377eec3d..9bbe3e7b8 100644 --- a/.github/workflows/python-formatting.yml +++ b/.github/workflows/python-formatting.yml @@ -1,7 +1,7 @@ name: Check Python Formatting on: pull_request: - branches: [ master ] + branches: [ main ] paths: - '.github/workflows/python-formatting.yml' - 'pyproject.toml' diff --git a/.github/workflows/python-linting.yml b/.github/workflows/python-linting.yml index e0267e013..93764f98e 100644 --- a/.github/workflows/python-linting.yml +++ b/.github/workflows/python-linting.yml @@ -1,7 +1,7 @@ name: Pylava on: pull_request: - branches: [ master ] + branches: [ main ] paths: - 'pyproject.toml' - '.github/workflows/python-linting.yml' diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml index 8331afaaa..07b70bfdd 100644 --- a/.github/workflows/shellcheck.yml +++ b/.github/workflows/shellcheck.yml @@ -1,13 +1,13 @@ name: Shellcheck Tests on: push: - branches: [ master ] + branches: [ main ] paths: - '.github/workflows/shellcheck.yml' - 'Makefile' - '**.sh' pull_request: - branches: [ master ] + branches: [ main ] paths: - '.github/workflows/shellcheck.yml' - 'Makefile' diff --git a/.github/workflows/trigger-test-images.yml b/.github/workflows/trigger-test-images.yml index b8defe737..eaf5b5e6b 100644 --- a/.github/workflows/trigger-test-images.yml +++ b/.github/workflows/trigger-test-images.yml @@ -2,7 +2,7 @@ name: Trigger test images on: pull_request: - branches: [ master ] + branches: [ main ] paths: - 'exporters/**' - 'charts/**' diff --git a/.github/workflows/typecheck.yml b/.github/workflows/typecheck.yml index 050dc8f56..66539c47a 100644 --- a/.github/workflows/typecheck.yml +++ b/.github/workflows/typecheck.yml @@ -1,7 +1,7 @@ name: Type Check (ignore failures for now) on: push: - branches: [ master ] + branches: [ main ] paths: - 'exporters/**' - 'pyproject.toml' @@ -9,7 +9,7 @@ on: - 'Makefile' pull_request: - branches: [ master ] + branches: [ main ] paths: - 'exporters/**' - 'pyproject.toml' diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index 9d0daf123..3270a46f1 100644 --- a/.github/workflows/unittests.yml +++ b/.github/workflows/unittests.yml @@ -1,7 +1,7 @@ name: Unit Tests on: push: - branches: [ master ] + branches: [ main ] paths: - 'exporters/**' - 'pyproject.toml' @@ -9,7 +9,7 @@ on: - 'Makefile' pull_request: - branches: [ master ] + branches: [ main ] paths: - 'exporters/**' - 'pyproject.toml' From 9535d657fe935acfa7037e7bae040d471230f133 Mon Sep 17 00:00:00 2001 From: Eric Sauer Date: Wed, 25 Sep 2024 13:38:50 +0000 Subject: [PATCH 2/2] Add ocp 4.16 to reamde to pass ci checks Signed-off-by: Eric Sauer --- README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/README.md b/README.md index 3a9b58c02..28f3599c0 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,15 @@ > [!WARNING] > This is NOT the active branch for pelorus. This is _Pelorus Next_, a future iteration of this repo that is not yet active. Please switch to the [master](https://github.com/dora-metrics/pelorus/tree/master) branch for the current active iteration of Pelorus. + +[![Python Linting](https://github.com/dora-metrics/pelorus/actions/workflows/python-linting.yml/badge.svg)](https://github.com/dora-metrics/pelorus/actions) +[![Unit tests](https://github.com/dora-metrics/pelorus/actions/workflows/unittests.yml/badge.svg)](https://github.com/dora-metrics/pelorus/actions) +[![Conftest](https://github.com/dora-metrics/pelorus/actions/workflows/conftest.yml/badge.svg)](https://github.com/dora-metrics/pelorus/actions) +[![Chart Lint](https://github.com/dora-metrics/pelorus/actions/workflows/chart-lint.yml/badge.svg)](https://github.com/dora-metrics/pelorus/actions) +[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) +[![Imports: isort](https://img.shields.io/badge/%20imports-isort-%231674b1?style=flat&labelColor=ef8336)](https://pycqa.github.io/isort/) +[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit) + +Prow CI Periodic E2E Tests: + +- OpenShift version 4.16 [![4.16 scenario 1 builds](https://prow.ci.openshift.org/badge.svg?jobs=periodic-ci-dora-metrics-pelorus-master-4.16-e2e-openshift-test-scenario-1-periodic)](https://prow.ci.openshift.org/job-history/gs/origin-ci-test/logs/periodic-ci-dora-metrics-pelorus-master-4.16 -e2e-openshift-test-scenario-1-periodic) \ No newline at end of file