From 4eaf1fe3469290afa3ce568d8880f894992010fe Mon Sep 17 00:00:00 2001 From: Jason Bonnell <166553723+jbonnell-amd@users.noreply.github.com> Date: Mon, 11 Aug 2025 14:31:17 -0400 Subject: [PATCH] [rocprofiler-systems] Add new secrets, update paths (#241) * Add new secrets, update paths * Remove old containers.yml workflow file * Update .github/workflows/rocprofiler-systems-containers.yml Co-authored-by: David Galiffi --------- Co-authored-by: David Galiffi --- .../rocprofiler-systems-containers.yml | 14 +- .../.github/workflows/containers.yml | 189 ------------------ 2 files changed, 7 insertions(+), 196 deletions(-) delete mode 100644 projects/rocprofiler-systems/.github/workflows/containers.yml diff --git a/.github/workflows/rocprofiler-systems-containers.yml b/.github/workflows/rocprofiler-systems-containers.yml index 5decd782fe..9e937e7f9d 100644 --- a/.github/workflows/rocprofiler-systems-containers.yml +++ b/.github/workflows/rocprofiler-systems-containers.yml @@ -8,7 +8,7 @@ on: - cron: 0 5 * * * push: paths: - - 'projects/rocprofiler-systems/.github/workflows/containers.yml' + - '.github/workflows/rocprofiler-systems-containers.yml' - 'projects/rocprofiler-systems/docker/**' concurrency: @@ -60,8 +60,8 @@ jobs: - name: Login to DockerHub uses: docker/login-action@v2 with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} + username: ${{ secrets.ROCPROF_SYS_DOCKER_LOGIN }} + password: ${{ secrets.ROCPROF_SYS_DOCKER_TOKEN }} - name: Build CI Container timeout-minutes: 45 @@ -72,7 +72,7 @@ jobs: max_attempts: 3 command: | pushd projects/rocprofiler-systems/docker - ./build-docker-ci.sh --distro ${{ matrix.distro }} --versions ${{ matrix.version }} --user ${{ secrets.DOCKERHUB_USERNAME }} --push --jobs 2 --elfutils-version 0.186 --boost-version 1.79.0 + ./build-docker-ci.sh --distro ${{ matrix.distro }} --versions ${{ matrix.version }} --user ${{ secrets.ROCPROF_SYS_DOCKER_LOGIN }} --push --jobs 2 --elfutils-version 0.188 --boost-version 1.79.0 popd rocprofiler-systems-release: @@ -172,8 +172,8 @@ jobs: - name: Login to DockerHub uses: docker/login-action@v2 with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} + username: ${{ secrets.ROCPROF_SYS_DOCKER_LOGIN }} + password: ${{ secrets.ROCPROF_SYS_DOCKER_TOKEN }} - name: Build Base Container timeout-minutes: 45 @@ -184,5 +184,5 @@ jobs: max_attempts: 3 command: | pushd projects/rocprofiler-systems/docker - ./build-docker.sh --distro ${{ matrix.os-distro }} --versions ${{ matrix.os-version }} --rocm-versions ${{ matrix.rocm-version }} --user ${{ secrets.DOCKERHUB_USERNAME }} --push + ./build-docker.sh --distro ${{ matrix.os-distro }} --versions ${{ matrix.os-version }} --rocm-versions ${{ matrix.rocm-version }} --user ${{ secrets.ROCPROF_SYS_DOCKER_LOGIN }} --push popd diff --git a/projects/rocprofiler-systems/.github/workflows/containers.yml b/projects/rocprofiler-systems/.github/workflows/containers.yml deleted file mode 100644 index 2362b8d38a..0000000000 --- a/projects/rocprofiler-systems/.github/workflows/containers.yml +++ /dev/null @@ -1,189 +0,0 @@ -name: Continuous Integration Containers -run-name: ci-containers - -# nightly build -on: - workflow_dispatch: - schedule: - - cron: 0 5 * * * - push: - branches: [amd-staging, amd-mainline] - paths: - - '.github/workflows/containers.yml' - - 'docker/**' - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -env: - GIT_DISCOVERY_ACROSS_FILESYSTEM: 1 - -jobs: - rocprofiler-systems-ci: - if: github.repository == 'ROCm/rocprofiler-systems' - - runs-on: ubuntu-latest - - strategy: - fail-fast: false - matrix: - include: - - distro: "ubuntu" - version: "20.04" - - distro: "ubuntu" - version: "22.04" - - distro: "ubuntu" - version: "24.04" - - distro: "opensuse" - version: "15.5" - - distro: "opensuse" - version: "15.6" - - distro: "rhel" - version: "8.10" - - distro: "rhel" - version: "9.3" - - distro: "rhel" - version: "9.4" - - distro: "rhel" - version: "9.5" - - steps: - - uses: actions/checkout@v4 - with: - submodules: recursive - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Login to DockerHub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build CI Container - timeout-minutes: 45 - uses: nick-fields/retry@v3 - with: - retry_wait_seconds: 60 - timeout_minutes: 45 - max_attempts: 3 - command: | - pushd docker - ./build-docker-ci.sh --distro ${{ matrix.distro }} --versions ${{ matrix.version }} --user ${{ secrets.DOCKERHUB_USERNAME }} --push --jobs 2 --elfutils-version 0.186 --boost-version 1.79.0 - popd - - rocprofiler-systems-release: - if: github.repository == 'ROCm/rocprofiler-systems' - - runs-on: ubuntu-latest - - strategy: - fail-fast: false - matrix: - include: - # ubuntu 20.04 - - os-distro: "ubuntu" - os-version: "20.04" - rocm-version: "0.0" - - os-distro: "ubuntu" - os-version: "20.04" - rocm-version: "6.3" - # ubuntu 22.04 - - os-distro: "ubuntu" - os-version: "22.04" - rocm-version: "0.0" - - os-distro: "ubuntu" - os-version: "22.04" - rocm-version: "6.3" - - os-distro: "ubuntu" - os-version: "22.04" - rocm-version: "6.4" - # ubuntu 24.04 - - os-distro: "ubuntu" - os-version: "24.04" - rocm-version: "0.0" - - os-distro: "ubuntu" - os-version: "24.04" - rocm-version: "6.3" - - os-distro: "ubuntu" - os-version: "24.04" - rocm-version: "6.4" - # opensuse 15.5 - - os-distro: "opensuse" - os-version: "15.5" - rocm-version: "0.0" - - os-distro: "opensuse" - os-version: "15.5" - rocm-version: "6.3" - # opensuse 15.6 - - os-distro: "opensuse" - os-version: "15.6" - rocm-version: "0.0" - - os-distro: "opensuse" - os-version: "15.6" - rocm-version: "6.3" - - os-distro: "opensuse" - os-version: "15.6" - rocm-version: "6.4" - # RHEL 8.10 - - os-distro: "rhel" - os-version: "8.10" - rocm-version: "0.0" - - os-distro: "rhel" - os-version: "8.10" - rocm-version: "6.3" - - os-distro: "rhel" - os-version: "8.10" - rocm-version: "6.4" - # RHEL 9.4 - - os-distro: "rhel" - os-version: "9.4" - rocm-version: "0.0" - - os-distro: "rhel" - os-version: "9.4" - rocm-version: "6.3" - - os-distro: "rhel" - os-version: "9.4" - rocm-version: "6.4" - # RHEL 9.5 - - os-distro: "rhel" - os-version: "9.5" - rocm-version: "0.0" - - os-distro: "rhel" - os-version: "9.5" - rocm-version: "6.3" - - os-distro: "rhel" - os-version: "9.5" - rocm-version: "6.4" - - steps: - - uses: actions/checkout@v4 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Login to DockerHub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build Base Container - timeout-minutes: 45 - uses: nick-fields/retry@v3 - with: - retry_wait_seconds: 60 - timeout_minutes: 45 - max_attempts: 3 - command: | - pushd docker - ./build-docker.sh --distro ${{ matrix.os-distro }} --versions ${{ matrix.os-version }} --rocm-versions ${{ matrix.rocm-version }} --user ${{ secrets.DOCKERHUB_USERNAME }} --push - popd