From 2b81efbbf6e6a2e0f7e3b1c59a255370de68c0c2 Mon Sep 17 00:00:00 2001 From: RWhiting <81450820+RWhiting78@users.noreply.github.com> Date: Fri, 20 Sep 2024 14:31:51 +0100 Subject: [PATCH 1/3] Updating running Ubuntu version. Updated the Ubuntu version that the workflow runs on. --- .github/workflows/pynetbox.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pynetbox.yaml b/.github/workflows/pynetbox.yaml index 92f62261..5cb9c8fd 100644 --- a/.github/workflows/pynetbox.yaml +++ b/.github/workflows/pynetbox.yaml @@ -11,7 +11,7 @@ on: jobs: Pylint-Tests-Codecov: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: matrix: python-version: ["3.x"] @@ -42,4 +42,4 @@ jobs: uses: codecov/codecov-action@v4 with: token: ${{secrets.CODECOV_TOKEN}} - files: ./pynetbox_query/coverage.xml \ No newline at end of file + files: ./pynetbox_query/coverage.xml From dd61c38cb3dc64a93088bc509d5d9355c73d94c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CRyan?= <“r_whiting@live.com> Date: Wed, 2 Oct 2024 09:53:09 +0100 Subject: [PATCH 2/3] Made a number of chances to the versions of Ubuntu running on some GitHub workflows. --- .github/workflows/MonitoringTools.yaml | 4 +- .github/workflows/cloud_chatops.yaml | 41 ----------------- .github/workflows/iriscast_package_build.yaml | 2 +- .../workflows/prometheus_query_to_csv.yaml | 4 +- .github/workflows/pynetbox.yaml | 45 ------------------- .github/workflows/reverse_ssl_cert_chain.yaml | 45 ------------------- 6 files changed, 5 insertions(+), 136 deletions(-) delete mode 100644 .github/workflows/cloud_chatops.yaml delete mode 100644 .github/workflows/pynetbox.yaml delete mode 100644 .github/workflows/reverse_ssl_cert_chain.yaml diff --git a/.github/workflows/MonitoringTools.yaml b/.github/workflows/MonitoringTools.yaml index da5d48fe..e225d4c1 100644 --- a/.github/workflows/MonitoringTools.yaml +++ b/.github/workflows/MonitoringTools.yaml @@ -11,7 +11,7 @@ on: jobs: Pylint-Tests-Codecov: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: matrix: python-version: ["3.x"] @@ -42,4 +42,4 @@ jobs: uses: codecov/codecov-action@v4 with: token: ${{secrets.CODECOV_TOKEN}} - files: ./MonitoringTools/coverage.xml \ No newline at end of file + files: ./MonitoringTools/coverage.xml diff --git a/.github/workflows/cloud_chatops.yaml b/.github/workflows/cloud_chatops.yaml deleted file mode 100644 index 499dddf4..00000000 --- a/.github/workflows/cloud_chatops.yaml +++ /dev/null @@ -1,41 +0,0 @@ -name: CI/CD Cloud ChatOps - -on: - push: - branches: - - master - pull_request: - paths: - - "cloud_chatops/**" - - ".github/workflows/cloud_chatops.yaml" - -jobs: - Pylint-Tests-Codecov: - runs-on: ubuntu-20.04 - strategy: - matrix: - python-version: [ "3.12", "3.x" ] - steps: - - uses: actions/checkout@v4 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v5 - with: - python-version: ${{ matrix.python-version }} - cache: "pip" - - - name: Install dependencies - run: | - python -m pip install --upgrade pip - cd cloud_chatops && pip install -r requirements.txt - - - name: Analyse with pylint - run: pylint cloud_chatops --rcfile=cloud_chatops/.pylintrc - - - name: Run tests and collect coverage - run: cd cloud_chatops && python3 -m pytest tests --cov-report xml:coverage.xml --cov - - - name: Upload coverage to Codecov - uses: codecov/codecov-action@v4 - with: - token: ${{secrets.CODECOV_TOKEN}} - files: ./cloud_chatops/coverage.xml diff --git a/.github/workflows/iriscast_package_build.yaml b/.github/workflows/iriscast_package_build.yaml index f33983b2..e551ea85 100644 --- a/.github/workflows/iriscast_package_build.yaml +++ b/.github/workflows/iriscast_package_build.yaml @@ -67,7 +67,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: ["3.10", "3.6.8"] + python-version: ["3.x", "3.10", "3.6.8"] steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} diff --git a/.github/workflows/prometheus_query_to_csv.yaml b/.github/workflows/prometheus_query_to_csv.yaml index f299ed92..679becd3 100644 --- a/.github/workflows/prometheus_query_to_csv.yaml +++ b/.github/workflows/prometheus_query_to_csv.yaml @@ -11,7 +11,7 @@ on: jobs: Pylint-Tests-Codecov: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: matrix: python-version: ["3.x"] @@ -39,4 +39,4 @@ jobs: uses: codecov/codecov-action@v4 with: token: ${{secrets.CODECOV_TOKEN}} - files: ./prometheus_query_to_csv/coverage.xml \ No newline at end of file + files: ./prometheus_query_to_csv/coverage.xml diff --git a/.github/workflows/pynetbox.yaml b/.github/workflows/pynetbox.yaml deleted file mode 100644 index 5cb9c8fd..00000000 --- a/.github/workflows/pynetbox.yaml +++ /dev/null @@ -1,45 +0,0 @@ -name: Pylint-Tests-Codecov - -on: - push: - branches: - - master - pull_request: - paths: - - "pynetbox_data_uploader/**" - - ".github/workflows/pynetbox.yaml" - -jobs: - Pylint-Tests-Codecov: - runs-on: ubuntu-22.04 - strategy: - matrix: - python-version: ["3.x"] - steps: - - uses: actions/checkout@v4 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v5 - with: - python-version: ${{ matrix.python-version }} - cache: "pip" - - - name: Install dependencies - run: | - python -m pip install --upgrade pip - cd pynetbox_query - pip install -r requirements.txt - - - name: Analyse with pylint - run: cd pynetbox_query && pylint $(git ls-files '*.py') - - - name: Run tests and collect coverage - run: cd pynetbox_query && python3 -m pytest - - - name: Run tests and collect coverage - run: cd pynetbox_query && python3 -m pytest . --cov-report xml:coverage.xml --cov - - - name: Upload coverage to Codecov - uses: codecov/codecov-action@v4 - with: - token: ${{secrets.CODECOV_TOKEN}} - files: ./pynetbox_query/coverage.xml diff --git a/.github/workflows/reverse_ssl_cert_chain.yaml b/.github/workflows/reverse_ssl_cert_chain.yaml deleted file mode 100644 index 1f86937b..00000000 --- a/.github/workflows/reverse_ssl_cert_chain.yaml +++ /dev/null @@ -1,45 +0,0 @@ -name: Pylint-Tests-Codecov - -on: - push: - branches: - - master - pull_request: - paths: - - "reverse_ssl_cert_chain/**" - - ".github/workflows/reverse_ssl_cert_chain.yaml" - -jobs: - Pylint-Tests-Codecov: - runs-on: ubuntu-20.04 - strategy: - matrix: - python-version: ["3.x"] - steps: - - uses: actions/checkout@v4 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v5 - with: - python-version: ${{ matrix.python-version }} - cache: "pip" - - - name: Install dependencies - run: | - python -m pip install --upgrade pip - cd reverse_ssl_cert_chain - pip install -r requirements.txt - - - name: Analyse with pylint - run: cd reverse_ssl_cert_chain && pylint $(git ls-files '*.py') - - - name: Run tests and collect coverage - run: cd reverse_ssl_cert_chain && python3 -m pytest - - - name: Run tests and collect coverage - run: cd reverse_ssl_cert_chain && python3 -m pytest . --cov-report xml:coverage.xml --cov - - - name: Upload coverage to Codecov - uses: codecov/codecov-action@v4 - with: - token: ${{ secrets.CODECOV_TOKEN }} - files: ./reverse_ssl_cert_chain/coverage.xml \ No newline at end of file From 6269c9ee9d489a74648024880802d557524eb6fe Mon Sep 17 00:00:00 2001 From: RWhiting <81450820+RWhiting78@users.noreply.github.com> Date: Wed, 2 Oct 2024 10:09:09 +0100 Subject: [PATCH 3/3] Reverting broken change. Reverting change that seems to be preventing tests from passing. --- .github/workflows/iriscast_package_build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/iriscast_package_build.yaml b/.github/workflows/iriscast_package_build.yaml index e551ea85..f33983b2 100644 --- a/.github/workflows/iriscast_package_build.yaml +++ b/.github/workflows/iriscast_package_build.yaml @@ -67,7 +67,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: ["3.x", "3.10", "3.6.8"] + python-version: ["3.10", "3.6.8"] steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }}