From f99ccfe0d9c75587e939c83f862c431f63d768b6 Mon Sep 17 00:00:00 2001 From: Oksana Salyk Date: Tue, 8 Apr 2025 21:12:50 +0200 Subject: [PATCH] common: update workflow files Signed-off-by: Oksana Salyk --- .github/workflows/docker_rebuild.yml | 4 ++-- .github/workflows/main.yml | 8 ++++---- .github/workflows/nightly.yml | 2 +- .github/workflows/pmem_ras.yml | 2 +- .github/workflows/pmem_test_matrix.yml | 4 ++-- .github/workflows/pmem_tests.yml | 12 ++++++------ .github/workflows/scan_coverage.yml | 2 +- .github/workflows/scan_coverity.yml | 2 +- .github/workflows/scan_ubsan.yml | 2 +- .github/workflows/ubuntu.yml | 2 +- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/docker_rebuild.yml b/.github/workflows/docker_rebuild.yml index 1587a1a711..ec9168769e 100644 --- a/.github/workflows/docker_rebuild.yml +++ b/.github/workflows/docker_rebuild.yml @@ -18,7 +18,7 @@ env: GH_CR_USER: ${{ secrets.GH_CR_USER }} GH_CR_PAT: ${{ secrets.GH_CR_PAT }} - GITHUB_REPO: pmem/pmdk + GITHUB_REPO: ${{ github.repository }} DOCKER_REPO: ghcr.io/pmem/pmdk WORKDIR: utils/docker PUSH_IMAGE: 1 @@ -27,7 +27,7 @@ permissions: {} jobs: image: - if: github.repository == 'pmem/pmdk' + if: ${{ github.repository_owner == 'daos-stack' }} name: Image runs-on: ubuntu-latest strategy: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1baacfe987..8346e92f70 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,11 +24,11 @@ jobs: fetch-depth: 50 - name: Check changelog - # Skip for pmem/pmdk/master and stable-* branches + # Skip for master and stable-* branches if: | - !(github.repository == 'pmem/pmdk' && - (github.ref_name == 'master' || startsWith(github.ref_name, 'stable-'))) && - github.event_name == 'pull_request' + !(github.repository_owner == 'daos-stack' && + (github.ref_name == 'master' || startsWith(github.ref_name, 'stable-'))) && + github.event_name == 'pull_request' uses: Zomzog/changelog-checker@09cfe9ad3618dcbfdba261adce0c41904cabb8c4 # v1.3.0 with: fileName: ChangeLog diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 4e73fff0f9..39f842527a 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -11,7 +11,7 @@ on: - '*' env: - GITHUB_REPO: pmem/pmdk + GITHUB_REPO: ${{ github.repository }} DOCKER_REPO: ghcr.io/pmem/pmdk HOST_WORKDIR: /home/runner/work/pmdk/pmdk WORKDIR: utils/docker diff --git a/.github/workflows/pmem_ras.yml b/.github/workflows/pmem_ras.yml index d587b45293..1ae0264d19 100644 --- a/.github/workflows/pmem_ras.yml +++ b/.github/workflows/pmem_ras.yml @@ -35,7 +35,7 @@ permissions: {} jobs: linux: name: PMEM_RAS - if: github.repository == 'pmem/pmdk' + if: github.repository_owner == 'daos-stack' runs-on: [self-hosted, ras_controller] env: WORKDIR: utils/gha-runners diff --git a/.github/workflows/pmem_test_matrix.yml b/.github/workflows/pmem_test_matrix.yml index b4dba3ae01..dcb1b27d24 100644 --- a/.github/workflows/pmem_test_matrix.yml +++ b/.github/workflows/pmem_test_matrix.yml @@ -22,8 +22,8 @@ permissions: {} jobs: job: name: ${{ matrix.force_enable }}, ${{ matrix.test_script }}, ${{ matrix.os }}, ${{ matrix.build }} - if: github.repository == 'pmem/pmdk' - runs-on: [self-hosted, "${{ matrix.os }}"] + if: github.repository_owner == 'daos-stack' + runs-on: [self-hosted, pmdk, "${{ matrix.os }}"] timeout-minutes: ${{ inputs.timeout_minutes }} strategy: fail-fast: false diff --git a/.github/workflows/pmem_tests.yml b/.github/workflows/pmem_tests.yml index b16cdd2f2d..6e8f4a680e 100644 --- a/.github/workflows/pmem_tests.yml +++ b/.github/workflows/pmem_tests.yml @@ -49,8 +49,8 @@ jobs: # Static builds are tested in this limited scope only. static: name: Static - if: github.repository == 'pmem/pmdk' - runs-on: [self-hosted, rhel] + if: github.repository_owner == 'daos-stack' + runs-on: [self-hosted, pmdk, rhel] strategy: fail-fast: false matrix: @@ -74,8 +74,8 @@ jobs: # at compile time. fault_injection: name: Fault injection - if: github.repository == 'pmem/pmdk' - runs-on: [self-hosted, rhel] + if: github.repository_owner == 'daos-satck' + runs-on: [self-hosted, pmdk, rhel] steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 @@ -100,8 +100,8 @@ jobs: # https://github.com/daos-stack/pmdk/pull/35 ndctl_enable_n: name: Without ndctl - if: github.repository == 'pmem/pmdk' - runs-on: [self-hosted, rhel] + if: github.repository_owner == 'daos-stack' + runs-on: [self-hosted, pmdk, rhel] steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 diff --git a/.github/workflows/scan_coverage.yml b/.github/workflows/scan_coverage.yml index 1583c69e0e..8a875a21ba 100644 --- a/.github/workflows/scan_coverage.yml +++ b/.github/workflows/scan_coverage.yml @@ -10,7 +10,7 @@ on: env: # Note: All coverage scans, e.g. on pull requests, should be run in the same # environment. - GITHUB_REPO: pmem/pmdk + GITHUB_REPO: ${{ github.repository }} DOCKER_REPO: ghcr.io/pmem/pmdk HOST_WORKDIR: /home/runner/work/pmdk/pmdk WORKDIR: utils/docker diff --git a/.github/workflows/scan_coverity.yml b/.github/workflows/scan_coverity.yml index cb6b49bb70..be77ec32d9 100644 --- a/.github/workflows/scan_coverity.yml +++ b/.github/workflows/scan_coverity.yml @@ -10,7 +10,7 @@ on: required: true env: - GITHUB_REPO: pmem/pmdk + GITHUB_REPO: ${{ github.repository }} DOCKER_REPO: ghcr.io/pmem/pmdk COVERITY_SCAN_NOTIFICATION_EMAIL: ${{ secrets.COVERITY_SCAN_NOTIFICATION_EMAIL }} COVERITY_SCAN_TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }} diff --git a/.github/workflows/scan_ubsan.yml b/.github/workflows/scan_ubsan.yml index 9d5065143b..41d7425dda 100644 --- a/.github/workflows/scan_ubsan.yml +++ b/.github/workflows/scan_ubsan.yml @@ -5,7 +5,7 @@ on: workflow_call: env: - GITHUB_REPO: pmem/pmdk + GITHUB_REPO: ${{ github.repository }} DOCKER_REPO: ghcr.io/pmem/pmdk HOST_WORKDIR: /home/runner/work/pmdk/pmdk WORKDIR: utils/docker diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 846ba06c84..3042c762e6 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -5,7 +5,7 @@ on: workflow_call: env: - GITHUB_REPO: pmem/pmdk + GITHUB_REPO: ${{ github.repository }} DOCKER_REPO: ghcr.io/pmem/pmdk permissions: {}