Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 21 additions & 19 deletions .github/workflows/main-pipeline.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,9 @@ jobs:
filters:
runs-on: ubuntu-latest
outputs:
docs: ${{ steps.filter.outputs.docs }}
foreman: ${{ steps.filter.outputs.foreman }}
foreman: ${{ steps.filter_foreman.outputs.foreman }}
Comment thread
pmoravec marked this conversation as resolved.
docs_count: ${{ steps.filter_docs.outputs.doc_files_count }}
all_count: ${{ steps.filter_docs.outputs.all_files_count }}
steps:
- uses: actions/checkout@v6

Expand All @@ -70,25 +71,26 @@ jobs:
- '**/candlepin.py'
- '**/pulp.py'
- '**/pulpcore.py'
- '**/valkey.py'
- '**/foreman_setup.sh'

- uses: dorny/paths-filter@v4
id: filter_docs
with:
predicate-quantifier: 'every'
filters: |
docs:
all_files:
- '**'
- '!man/**'
- '!docs/**'
- '!po/**'
- '!**/*.md'
- '!AUTHORS'
- '!LICENSE'
doc_files:
- 'man/**'
- 'docs/**'
- 'po/**'
- '**/*.md'
- 'AUTHORS'
- 'LICENSE'

py_tests:
needs: filters
if: needs.filters.outputs.docs == 'true'
if: needs.filters.outputs.all_count > needs.filters.outputs.docs_count
strategy:
matrix:
py_version: [ '3.9', '3.x' ]
Expand All @@ -98,7 +100,7 @@ jobs:

build_deb:
needs: [filters, setup]
if: needs.filters.outputs.docs == 'true'
if: needs.filters.outputs.all_count > needs.filters.outputs.docs_count
strategy:
matrix:
distro: ${{ fromJson(needs.setup.outputs.deb_matrix) }}
Expand All @@ -109,7 +111,7 @@ jobs:

build_rpm:
needs: [filters, setup]
if: needs.filters.outputs.docs == 'true'
if: needs.filters.outputs.all_count > needs.filters.outputs.docs_count
strategy:
matrix:
distro: ${{ fromJson(needs.setup.outputs.rpm_matrix) }}
Expand All @@ -120,26 +122,26 @@ jobs:

build_snap:
needs: [filters, setup]
if: needs.filters.outputs.docs == 'true'
if: needs.filters.outputs.all_count > needs.filters.outputs.docs_count
uses: ./.github/workflows/build-snap.yaml

flake8:
needs: filters
if: needs.filters.outputs.docs == 'true'
if: needs.filters.outputs.all_count > needs.filters.outputs.docs_count
uses: ./.github/workflows/tox.yaml
with:
test_name: flake8

pylint:
needs: filters
if: needs.filters.outputs.docs == 'true'
if: needs.filters.outputs.all_count > needs.filters.outputs.docs_count
uses: ./.github/workflows/tox.yaml
with:
test_name: pylint

unit:
needs: [filters, setup, build_deb, build_snap, build_rpm]
if: needs.filters.outputs.docs == 'true'
if: needs.filters.outputs.all_count > needs.filters.outputs.docs_count
strategy:
matrix:
distro: ${{ fromJson(needs.setup.outputs.distro_matrix) }}
Expand All @@ -153,7 +155,7 @@ jobs:

stage_one:
needs: [filters, setup, build_deb, build_snap, build_rpm, unit]
if: needs.filters.outputs.docs == 'true'
if: needs.filters.outputs.all_count > needs.filters.outputs.docs_count
strategy:
matrix:
distro: ${{ fromJson(needs.setup.outputs.distro_matrix) }}
Expand All @@ -169,7 +171,7 @@ jobs:

stage_two:
needs: [filters, setup, build_deb, build_snap, build_rpm, stage_one]
if: needs.filters.outputs.docs == 'true'
if: needs.filters.outputs.all_count > needs.filters.outputs.docs_count
strategy:
matrix:
distro: ${{ fromJson(needs.setup.outputs.stagetwo_matrix) }}
Expand Down
3 changes: 2 additions & 1 deletion sos/report/plugins/foremanctl.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ def postproc(self):
r"((passw|cred|token|secret|key)\w*\s*=\s*)(.*?)(\s|,|\"|'|$)",
r"\1********\4")

# Scrub passwords from foremanctl logs - Pattern 2: "password something" format
# Scrub passwords from foremanctl logs -
# Pattern 2: "password something" format
self.do_path_regex_sub(
"/var/log/foremanctl/foremanctl.*log*",
r"(password\s+)(.*?)(\s|,|\"|$)",
Expand Down
Loading