Skip to content

Commit

Permalink
'fix: Add squid branch in builds
Browse files Browse the repository at this point in the history
- Squid branch is missing in ceph-dev builds.
- Also removes google chat notification as we no longer use google chat.
- Adding secrets as env variables as the workflow was not picking them

Signed-off-by: Afreen Misbah <[email protected]>
  • Loading branch information
afreen23 committed Oct 10, 2024
1 parent 6d996d1 commit 6b80c25
Showing 1 changed file with 17 additions and 25 deletions.
42 changes: 17 additions & 25 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,24 @@ name: Publish ceph images

on:
push:
branches:
secrets:
DOCKER_PASSWORD:
required: true
DOCKER_USERNAME:
required: true
branches:
- main
paths:
- .github/workflows/main.yml
- docker/ceph/aws/aws-cli-configure.sh
- 'docker/ceph/**/Dockerfile'
- docker/ceph/rpm/set-ceph-repo.sh
pull_request:
secrets:
DOCKER_PASSWORD:
required: true
DOCKER_USERNAME:
required: true
branches:
- main
paths:
Expand All @@ -34,16 +44,12 @@ jobs:
uses: actions/checkout@master
- name: Build
run: docker build -t docker.io/rhcsdashboard/ceph-base:${{ matrix.os }} -f docker/ceph/centos/Dockerfile ./docker/ceph
# - name: Google Chat Notification
# uses: Co-qn/google-chat-notification@b9227d9daa4638c9782a5bd16c4abb86268127a1
# with:
# name: Build
# url: ${{ secrets.GOOGLE_CHAT_WEBHOOK }}
# status: ${{ job.status }}
# if: failure()
- name: Push
env:
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
run: |
echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin
docker push docker.io/rhcsdashboard/ceph-base:${{ matrix.os }}
docker logout
build-ceph:
Expand All @@ -52,7 +58,7 @@ jobs:
strategy:
fail-fast: false
matrix:
branch: [main, reef, quincy, pacific]
branch: [main, squid, reef, quincy, pacific]
name: [ceph, ceph-rpm]
include:
- centos_version: 9
Expand All @@ -65,13 +71,6 @@ jobs:
uses: actions/checkout@master
- name: Build
run: docker build -t docker.io/rhcsdashboard/${{ matrix.name }}:${{ matrix.branch }} -f docker/${{ matrix.dir }}/${{ matrix.branch_dir}}/Dockerfile ./docker/ceph --build-arg CEPH_RELEASE=${{ matrix.branch }} --build-arg VCS_BRANCH=${{ matrix.branch }} --build-arg CENTOS_VERSION=${{ matrix.centos_version }}
- name: Google Chat Notification
uses: Co-qn/google-chat-notification@b9227d9daa4638c9782a5bd16c4abb86268127a1
with:
name: Build
url: ${{ secrets.GOOGLE_CHAT_WEBHOOK }}
status: ${{ job.status }}
if: failure()
- name: Push
run: |
echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
Expand All @@ -82,19 +81,12 @@ jobs:
strategy:
fail-fast: false
matrix:
branch: [main, reef, quincy, pacific]
branch: [main, squid, reef, quincy, pacific]
steps:
- name: Checkout
uses: actions/checkout@master
- name: Build
run: docker build -t docker.io/rhcsdashboard/ceph-e2e:${{ matrix.branch }} -f docker/ceph/e2e/Dockerfile ./docker/ceph --build-arg VCS_BRANCH=${{ matrix.branch }}
- name: Google Chat Notification
uses: Co-qn/google-chat-notification@b9227d9daa4638c9782a5bd16c4abb86268127a1
with:
name: Build
url: ${{ secrets.GOOGLE_CHAT_WEBHOOK }}
status: ${{ job.status }}
if: failure()
- name: Push
run: |
echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
Expand Down

0 comments on commit 6b80c25

Please sign in to comment.