From ca174c79dc9e88b17503d871b8818dd648df2561 Mon Sep 17 00:00:00 2001 From: Vasily Nemkov Date: Tue, 28 Feb 2023 17:19:07 +0100 Subject: [PATCH 1/3] Using secrets for managing AWS access --- .github/workflows/release_branches.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/release_branches.yml b/.github/workflows/release_branches.yml index d210c8ac7103..2f89e33b6d2d 100644 --- a/.github/workflows/release_branches.yml +++ b/.github/workflows/release_branches.yml @@ -21,6 +21,11 @@ on: # yamllint disable-line rule:truthy branches: - 'releases/22.8**' +env: + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + jobs: # DockerHubPushAarch64: # runs-on: [self-hosted, style-checker-aarch64] From df30db829ff57a2362d36e8681fe94623af42a69 Mon Sep 17 00:00:00 2001 From: Vasily Nemkov Date: Tue, 28 Feb 2023 17:29:52 +0100 Subject: [PATCH 2/3] Update release_branches.yml --- .github/workflows/release_branches.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release_branches.yml b/.github/workflows/release_branches.yml index 2f89e33b6d2d..a06264449dfc 100644 --- a/.github/workflows/release_branches.yml +++ b/.github/workflows/release_branches.yml @@ -3,6 +3,10 @@ name: ReleaseBranchCI env: # Force the stdout and stderr streams to be unbuffered PYTHONUNBUFFERED: 1 + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + on: # yamllint disable-line rule:truthy pull_request: @@ -21,11 +25,6 @@ on: # yamllint disable-line rule:truthy branches: - 'releases/22.8**' -env: - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} - AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - jobs: # DockerHubPushAarch64: # runs-on: [self-hosted, style-checker-aarch64] From 0e2ba9b4e58a38397d44b80de5a2004a0da08c31 Mon Sep 17 00:00:00 2001 From: Vasily Nemkov Date: Fri, 3 Mar 2023 00:37:24 +0100 Subject: [PATCH 3/3] Fixed tag checking code --- tests/ci/git_helper.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/ci/git_helper.py b/tests/ci/git_helper.py index 10f17f083889..dce9a0e993d5 100644 --- a/tests/ci/git_helper.py +++ b/tests/ci/git_helper.py @@ -10,10 +10,13 @@ # ^ and $ match subline in `multiple\nlines` # \A and \Z match only start and end of the whole string +# NOTE (vnemkov): support both upstream tag style: v22.x.y.z-lts and Altinity tag style: v22.x.y.z.altinitystable +# Because at early release stages there could be no Altinity tag set on commit, only upstream one. RELEASE_BRANCH_REGEXP = r"\A\d+[.]\d+\Z" TAG_REGEXP = ( - r"\Av\d{2}[.][1-9]\d*[.][1-9]\d*[.][1-9]\d*-(testing|prestable|stable|lts|altinitystable)\Z" + r"\Av\d{2}[.][1-9]\d*[.][1-9]\d*[.][1-9]\d*[-\.](testing|prestable|stable|lts|altinitystable)\Z" ) + SHA_REGEXP = r"\A([0-9]|[a-f]){40}\Z" CWD = p.dirname(p.realpath(__file__))