From 391be3336911e3274e42c26d1be46d0f3088236d Mon Sep 17 00:00:00 2001 From: Kalibh Halford Date: Thu, 20 Mar 2025 14:05:56 +0000 Subject: [PATCH 1/2] MAINT: Remove Rabbit Consumer workflow Rabbit consumer was moved out of this repository and this workflow was forgotten. It should be removed --- .../workflows/rabbit_consumer_schedule.yaml | 94 ------------------- 1 file changed, 94 deletions(-) delete mode 100644 .github/workflows/rabbit_consumer_schedule.yaml diff --git a/.github/workflows/rabbit_consumer_schedule.yaml b/.github/workflows/rabbit_consumer_schedule.yaml deleted file mode 100644 index cefc5469..00000000 --- a/.github/workflows/rabbit_consumer_schedule.yaml +++ /dev/null @@ -1,94 +0,0 @@ -name: Rabbit Consumer Schedule - -# Incrementing the patch version on a schedule to pull latest containers dependencies. - -on: - schedule: - - cron: "12 10 * * TUE" # Every Tuesday at 10.12am - -jobs: - test_and_lint: - runs-on: ubuntu-latest - strategy: - matrix: - python-version: ["3.10"] - 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: | - sudo apt-get update --fix-missing - python -m pip install --upgrade pip - # Required for requests-kerberos - sudo DEBIAN_FRONTEND=noninteractive apt-get -yq install libkrb5-dev - pip install -r OpenStack-Rabbit-Consumer/requirements.txt - pip install -r OpenStack-Rabbit-Consumer/requirements-test.txt - - - name: Run tests - # Using Python3 to launch the module sets up the Python path for us - run: cd OpenStack-Rabbit-Consumer && python3 -m coverage run -m pytest . - - - name: Analyse with pylint - run: | - cd OpenStack-Rabbit-Consumer && pylint $(git ls-files '*.py') - - - name: Prepare coverage - run: | - cd OpenStack-Rabbit-Consumer && python -m coverage xml - - push_release_image_harbor: - runs-on: ubuntu-latest - needs: test_and_lint - steps: - - uses: actions/checkout@v4 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Login to Harbor - uses: docker/login-action@v3 - with: - registry: harbor.stfc.ac.uk - username: ${{ secrets.HARBOR_USERNAME }} - password: ${{ secrets.HARBOR_TOKEN }} - - #increments ONLY the patch version using the version_incrememnt.sh script and commits the version.txt file to master - - name: Increment Version - run: bash ${{ github.workspace }}/.github/workflows/bin/version_increment.sh - - - name: Get release tag for later - id: release_tag - run: echo "version=$(cat OpenStack-Rabbit-Consumer/version.txt)" >> $GITHUB_OUTPUT - - - name: Build and push on version change - uses: docker/build-push-action@v6 - if: steps.release_updated.outputs.version == 'true' - with: - cache-from: type=gha - cache-to: type=gha,mode=max - push: true - context: "{{defaultContext}}:OpenStack-Rabbit-Consumer" - tags: "harbor.stfc.ac.uk/stfc-cloud/openstack-rabbit-consumer-schedule:v${{ steps.release_tag.outputs.version }}" - - - name: Inform of tagged name - if: steps.release_updated.outputs.version == 'true' - run: echo "Image published to harbor.stfc.ac.uk/stfc-cloud/openstack-rabbit-consumer-schedule:v${{ steps.release_tag.outputs.version }}" - - - name: Commit Changes - uses: EndBug/add-and-commit@v9 - with: - add: ${{ github.workspace }}/OpenStack-Rabbit-Consumer/version.txt - default_author: github_actions - committer_name: GitHub Actions - committer_email: actions@github.com - new_branch: rabbitConsumerDependUpdate - - - name: create pull request - run: gh pr create -B master -H rabbitConsumerDependUpdate --title 'Merge rabbitConsumerDependUpdate into master' --body 'Updating the dependencies for Rabbit Consumer Image. Created by Github action' - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - \ No newline at end of file From 6e2ba9a8c916d1864a4ac03a578b93907c2a2609 Mon Sep 17 00:00:00 2001 From: Kalibh Halford Date: Thu, 20 Mar 2025 14:06:54 +0000 Subject: [PATCH 2/2] MAINT: Change all workflows to only run when their files are changed These workflows are running every time any code is pushed to main. They should only run when code belonging to them is in a pull request or pushed to main --- .github/workflows/MonitoringTools.yaml | 3 +++ .github/workflows/Openstack-Rally-Tester.yaml | 3 +++ .github/workflows/aq_zombie_finder.yaml | 3 +++ .github/workflows/dns_entry_checker.yaml | 3 +++ .github/workflows/gpu_benchmark.yaml | 3 +++ .github/workflows/iriscast_package_build.yaml | 3 +++ .github/workflows/jsm_metric_collection.yaml | 3 +++ .github/workflows/prometheus_query_to_csv.yaml | 3 +++ .github/workflows/word_cloud_generator.yaml | 3 +++ 9 files changed, 27 insertions(+) diff --git a/.github/workflows/MonitoringTools.yaml b/.github/workflows/MonitoringTools.yaml index 85c84fda..195a2c75 100644 --- a/.github/workflows/MonitoringTools.yaml +++ b/.github/workflows/MonitoringTools.yaml @@ -4,6 +4,9 @@ on: push: branches: - master + paths: + - "MonitoringTools/**" + - ".github/workflows/MonitoringTools.yaml" pull_request: paths: - "MonitoringTools/**" diff --git a/.github/workflows/Openstack-Rally-Tester.yaml b/.github/workflows/Openstack-Rally-Tester.yaml index 3324ef8f..d06913cf 100644 --- a/.github/workflows/Openstack-Rally-Tester.yaml +++ b/.github/workflows/Openstack-Rally-Tester.yaml @@ -4,6 +4,9 @@ on: push: branches: - master + paths: + - ".github/workflows/Openstack-Rally-Tester.yaml" + - "OpenStack-Rally-Tester/**" pull_request: paths: - ".github/workflows/Openstack-Rally-Tester.yaml" diff --git a/.github/workflows/aq_zombie_finder.yaml b/.github/workflows/aq_zombie_finder.yaml index 41bcfcae..7b5c7aae 100644 --- a/.github/workflows/aq_zombie_finder.yaml +++ b/.github/workflows/aq_zombie_finder.yaml @@ -4,6 +4,9 @@ on: push: branches: - master + paths: + - "aq_zombie_finder/**" + - ".github/workflows/aq_zombie_finder.yaml" pull_request: paths: - "aq_zombie_finder/**" diff --git a/.github/workflows/dns_entry_checker.yaml b/.github/workflows/dns_entry_checker.yaml index 17304908..114c4b73 100644 --- a/.github/workflows/dns_entry_checker.yaml +++ b/.github/workflows/dns_entry_checker.yaml @@ -4,6 +4,9 @@ on: push: branches: - master + paths: + - "dns_entry_checker/**" + - ".github/workflows/dns_entry_checker.yaml" pull_request: paths: - "dns_entry_checker/**" diff --git a/.github/workflows/gpu_benchmark.yaml b/.github/workflows/gpu_benchmark.yaml index 222dcea2..29bb865d 100644 --- a/.github/workflows/gpu_benchmark.yaml +++ b/.github/workflows/gpu_benchmark.yaml @@ -3,6 +3,9 @@ on: push: branches: - master + paths: + - ".github/workflows/gpu_benchmark.yml" + - "gpu_benchmark/**" pull_request: paths: - ".github/workflows/gpu_benchmark.yml" diff --git a/.github/workflows/iriscast_package_build.yaml b/.github/workflows/iriscast_package_build.yaml index ce8f75b2..d9c5417e 100644 --- a/.github/workflows/iriscast_package_build.yaml +++ b/.github/workflows/iriscast_package_build.yaml @@ -4,6 +4,9 @@ on: push: branches: - master + paths: + - "iriscasttools/**" + - ".github/workflows/iriscast_package_build.yaml" pull_request: paths: - "iriscasttools/**" diff --git a/.github/workflows/jsm_metric_collection.yaml b/.github/workflows/jsm_metric_collection.yaml index 6c7338d3..1f4a1056 100644 --- a/.github/workflows/jsm_metric_collection.yaml +++ b/.github/workflows/jsm_metric_collection.yaml @@ -4,6 +4,9 @@ on: push: branches: - master + paths: + - "jsm_metric_collection/**" + - ".github/workflows/jsm_metric_collection.yaml" pull_request: paths: - "jsm_metric_collection/**" diff --git a/.github/workflows/prometheus_query_to_csv.yaml b/.github/workflows/prometheus_query_to_csv.yaml index 486e28f9..a3d5082d 100644 --- a/.github/workflows/prometheus_query_to_csv.yaml +++ b/.github/workflows/prometheus_query_to_csv.yaml @@ -4,6 +4,9 @@ on: push: branches: - master + paths: + - "prometheus_query_to_csv/**" + - ".github/workflows/prometheus_query_to_csv.yaml" pull_request: paths: - "prometheus_query_to_csv/**" diff --git a/.github/workflows/word_cloud_generator.yaml b/.github/workflows/word_cloud_generator.yaml index 48d4f0de..e1f88049 100644 --- a/.github/workflows/word_cloud_generator.yaml +++ b/.github/workflows/word_cloud_generator.yaml @@ -4,6 +4,9 @@ on: push: branches: - master + paths: + - "word_cloud_generator/**" + - ".github/workflows/word_cloud_generator.yaml" pull_request: paths: - "word_cloud_generator/**"