release: Ensure the release-type is passed to workflows

We need to ensure the release type is passed down to workflows,
otherwise we'll fail to get the correct release version for tagging the
daemonset images.

Fixes: #9064 - part III

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
This commit is contained in:
Fabiano Fidêncio
2024-02-29 22:48:45 +01:00
committed by stevenhorsman
parent a0a50f5e52
commit 658fb6972b
6 changed files with 36 additions and 8 deletions

View File

@@ -5,6 +5,9 @@ on:
target-arch:
required: true
type: string
release-type:
required: true
type: string
jobs:
build-kata-static-tarball-amd64:
@@ -42,7 +45,7 @@ jobs:
# is "refs/tags/<tag>"
tag=$(echo $GITHUB_REF | cut -d/ -f3-)
if [ "${tag}" = "main" ]; then
tag=$(./tools/packaging/release/release.sh next-release-version)
tag=$(RELEASE_TYPE=${{ inputs.release-type }} ./tools/packaging/release/release.sh next-release-version)
tags=(${tag} "latest")
else
tags=(${tag})

View File

@@ -5,6 +5,9 @@ on:
target-arch:
required: true
type: string
release-type:
required: true
type: string
jobs:
build-kata-static-tarball-arm64:
@@ -42,7 +45,7 @@ jobs:
# is "refs/tags/<tag>"
tag=$(echo $GITHUB_REF | cut -d/ -f3-)
if [ "${tag}" = "main" ]; then
tag=$(./tools/packaging/release/release.sh next-release-version)
tag=$(RELEASE_TYPE=${{ inputs.release-type }} ./tools/packaging/release/release.sh next-release-version)
tags=(${tag} "latest")
else
tags=(${tag})

View File

@@ -5,6 +5,9 @@ on:
target-arch:
required: true
type: string
release-type:
required: true
type: string
jobs:
build-kata-static-tarball-ppc64le:
@@ -42,7 +45,7 @@ jobs:
# is "refs/tags/<tag>"
tag=$(echo $GITHUB_REF | cut -d/ -f3-)
if [ "${tag}" = "main" ]; then
tag=$(./tools/packaging/release/release.sh next-release-version)
tag=$(RELEASE_TYPE=${{ inputs.release-type }} ./tools/packaging/release/release.sh next-release-version)
tags=(${tag} "latest")
else
tags=(${tag})

View File

@@ -5,6 +5,9 @@ on:
target-arch:
required: true
type: string
release-type:
required: true
type: string
jobs:
build-kata-static-tarball-s390x:
@@ -43,7 +46,7 @@ jobs:
# is "refs/tags/<tag>"
tag=$(echo $GITHUB_REF | cut -d/ -f3-)
if [ "${tag}" = "main" ]; then
tag=$(./tools/packaging/release/release.sh next-release-version)
tag=$(RELEASE_TYPE=${{ inputs.release-type }} ./tools/packaging/release/release.sh next-release-version)
tags=(${tag} "latest")
else
tags=(${tag})

View File

@@ -6,12 +6,11 @@ on:
required: true
type: string
env:
RELEASE_TYPE: ${{ inputs.release-type }}
jobs:
release:
runs-on: ubuntu-latest
env:
RELEASE_TYPE: ${{ inputs.release-type }}
steps:
- name: Checkout code
uses: actions/checkout@v4
@@ -38,6 +37,7 @@ jobs:
uses: ./.github/workflows/release-amd64.yaml
with:
target-arch: amd64
release-type: ${{ inputs.release-type }}
secrets: inherit
build-and-push-assets-arm64:
@@ -45,6 +45,7 @@ jobs:
uses: ./.github/workflows/release-arm64.yaml
with:
target-arch: arm64
release-type: ${{ inputs.release-type }}
secrets: inherit
build-and-push-assets-s390x:
@@ -52,6 +53,7 @@ jobs:
uses: ./.github/workflows/release-s390x.yaml
with:
target-arch: s390x
release-type: ${{ inputs.release-type }}
secrets: inherit
build-and-push-assets-ppc64le:
@@ -59,11 +61,14 @@ jobs:
uses: ./.github/workflows/release-ppc64le.yaml
with:
target-arch: ppc64le
release-type: ${{ inputs.release-type }}
secrets: inherit
publish-multi-arch-images:
runs-on: ubuntu-latest
needs: [build-and-push-assets-amd64, build-and-push-assets-arm64, build-and-push-assets-s390x, build-and-push-assets-ppc64le]
env:
RELEASE_TYPE: ${{ inputs.release-type }}
steps:
- name: Checkout repository
uses: actions/checkout@v4
@@ -95,6 +100,8 @@ jobs:
upload-multi-arch-static-tarball:
needs: [build-and-push-assets-amd64, build-and-push-assets-arm64, build-and-push-assets-s390x, build-and-push-assets-ppc64le]
runs-on: ubuntu-latest
env:
RELEASE_TYPE: ${{ inputs.release-type }}
steps:
- uses: actions/checkout@v4
@@ -150,6 +157,8 @@ jobs:
upload-versions-yaml:
needs: release
runs-on: ubuntu-latest
env:
RELEASE_TYPE: ${{ inputs.release-type }}
steps:
- uses: actions/checkout@v4
- name: upload versions.yaml
@@ -161,6 +170,8 @@ jobs:
upload-cargo-vendored-tarball:
needs: release
runs-on: ubuntu-latest
env:
RELEASE_TYPE: ${{ inputs.release-type }}
steps:
- uses: actions/checkout@v4
- name: generate-and-upload-tarball
@@ -172,6 +183,8 @@ jobs:
upload-libseccomp-tarball:
needs: release
runs-on: ubuntu-latest
env:
RELEASE_TYPE: ${{ inputs.release-type }}
steps:
- uses: actions/checkout@v4
- name: download-and-upload-tarball

View File

@@ -22,7 +22,7 @@ IFS=' ' read -a REGISTRIES <<< "${KATA_DEPLOY_REGISTRIES}"
GH_TOKEN="${GH_TOKEN:-}"
ARCHITECTURE="${ARCHITECTURE:-}"
KATA_STATIC_TARBALL="${KATA_STATIC_TARBALL:-}"
RELEASE_TYPE="${RELEASE_TYPE:-minor}"
RELEASE_TYPE="${RELEASE_TYPE:-}"
function _die()
{
@@ -35,6 +35,7 @@ function _check_required_env_var()
local env_var
case ${1} in
RELEASE_TYPE) env_var="${RELEASE_TYPE}" ;;
RELEASE_VERSION) env_var="${RELEASE_VERSION}" ;;
GH_TOKEN) env_var="${GH_TOKEN}" ;;
ARCHITECTURE) env_var="${ARCHITECTURE}" ;;
@@ -52,6 +53,8 @@ function _check_required_env_var()
function _next_release_version()
{
_check_required_env_var "RELEASE_TYPE"
local current_release=$(cat "${repo_root_dir}/VERSION")
local current_major
local current_everything_else