Skip to content

Commit

Permalink
Make "release container" use the workflow template
Browse files Browse the repository at this point in the history
- the release container will use DEV tags
- dispatcher updated to contain it also
  • Loading branch information
RazvanLiviuVarzaru committed Aug 29, 2024
1 parent 90349e4 commit 9a3e8c4
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 152 deletions.
150 changes: 0 additions & 150 deletions .github/workflows/bbw_build_container_release.yml

This file was deleted.

35 changes: 35 additions & 0 deletions .github/workflows/build-container-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Build container release

on:
push:
paths:
- 'ci_build_images/debian-release.Dockerfile'
- 'ci_build_images/qpress.Dockerfile'
- 'ci_build_images/buildbot-worker.Dockerfile'
- .github/workflows/build-container-release.yml
- .github/workflows/bbw_build_container_template.yml
pull_request:
paths:
- 'ci_build_images/debian-release.Dockerfile'
- 'ci_build_images/qpress.Dockerfile'
- 'ci_build_images/buildbot-worker.Dockerfile'
- .github/workflows/build-container-release.yml
- .github/workflows/bbw_build_container_template.yml
workflow_call:

jobs:
build-images:
strategy:
fail-fast: false
matrix:
include:
- image: debian:12-slim
platforms: linux/amd64
tag: debian12-release
uses: ./.github/workflows/bbw_build_container_template.yml
with:
dockerfile: debian-release.Dockerfile
image: ${{ matrix.image }}
platforms: ${{ matrix.platforms }}
tag: ${{ matrix.tag }}
secrets: inherit
9 changes: 9 additions & 0 deletions .github/workflows/build-workflow-dispatcher.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ on:
required: true
default: false
type: boolean
build-release-container:
description: 'Build release container'
required: true
default: false
type: boolean

jobs:
build-centos-based:
Expand Down Expand Up @@ -95,3 +100,7 @@ jobs:
if: ${{ inputs.build-slespip-based }}
uses: ./.github/workflows/build-sles.pip-based.yml
secrets: inherit
build-release-container:
if: ${{ inputs.build-release-container }}
uses: ./.github/workflows/build-container-release.yml
secrets: inherit
4 changes: 2 additions & 2 deletions ci_build_images/debian-release.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
# Provides a base Debian image with latest buildbot worker installed for prep
# release works.

ARG base_image
FROM "$base_image"
ARG BASE_IMAGE
FROM "$BASE_IMAGE"
LABEL maintainer="MariaDB Buildbot maintainers"

# This will make apt-get install without question
Expand Down

0 comments on commit 9a3e8c4

Please sign in to comment.