Skip to content

Commit

Permalink
Update base image to use stable branch 'release-0.18'
Browse files Browse the repository at this point in the history
Signed-off-by: Automated Release <release@submariner.io>
  • Loading branch information
Automated Release committed Jun 3, 2024
1 parent 1f39e36 commit 4812156
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ jobs:
name: PR targets branch
runs-on: ubuntu-latest
steps:
- name: Check that the PR targets devel
if: ${{ github.base_ref != 'devel' }}
- name: Check that the PR targets release-0.18
if: ${{ github.base_ref != 'release-0.18' }}
run: exit 1
10 changes: 5 additions & 5 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29

- name: Build the images if necessary
uses: submariner-io/shipyard/gh-actions/cache-images@devel
uses: submariner-io/shipyard/gh-actions/cache-images@release-0.18

# Both E2E jobs have the same name; the default job is un-suffixed, the full jobs are suffixed with their matrix combination
e2e-default:
Expand All @@ -29,11 +29,11 @@ jobs:
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29

- name: Run E2E deployment and tests
uses: submariner-io/shipyard/gh-actions/e2e@devel
uses: submariner-io/shipyard/gh-actions/e2e@release-0.18

- name: Post mortem
if: failure()
uses: submariner-io/shipyard/gh-actions/post-mortem@devel
uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.18

e2e-full:
name: E2E
Expand All @@ -60,11 +60,11 @@ jobs:
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29

- name: Run E2E deployment and tests
uses: submariner-io/shipyard/gh-actions/e2e@devel
uses: submariner-io/shipyard/gh-actions/e2e@release-0.18
with:
k8s_version: ${{ matrix.k8s_version }}
using: ${{ matrix.deploytool }} ${{ matrix.globalnet }}

- name: Post mortem
if: failure()
uses: submariner-io/shipyard/gh-actions/post-mortem@devel
uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.18
4 changes: 2 additions & 2 deletions .github/workflows/flake_finder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ jobs:
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29

- name: Run E2E deployment and tests
uses: submariner-io/shipyard/gh-actions/e2e@devel
uses: submariner-io/shipyard/gh-actions/e2e@release-0.18
with:
using: ${{ matrix.deploytool }} ${{ matrix.globalnet }}

- name: Post mortem
if: failure()
uses: submariner-io/shipyard/gh-actions/post-mortem@devel
uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.18
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
workflow_dispatch:
push:
branches:
- devel
- release-0.18
- release-*

permissions: {}
Expand All @@ -22,7 +22,7 @@ jobs:
fetch-depth: 0

- name: Build and release new images
uses: submariner-io/shipyard/gh-actions/release-images@devel
uses: submariner-io/shipyard/gh-actions/release-images@release-0.18
with:
username: ${{ secrets.QUAY_USERNAME }}
password: ${{ secrets.QUAY_PASSWORD }}
2 changes: 1 addition & 1 deletion .github/workflows/report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: Reporting
on:
push:
branches:
- devel
- release-0.18
- release-*

permissions: {}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/upgrade-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Upgrade

on:
pull_request:
branches: [devel]
branches: [release-0.18]

permissions: {}

Expand All @@ -19,8 +19,8 @@ jobs:
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29

- name: Install an old cluster, upgrade it and check it
uses: submariner-io/shipyard/gh-actions/upgrade-e2e@devel
uses: submariner-io/shipyard/gh-actions/upgrade-e2e@release-0.18

- name: Post Mortem
if: failure()
uses: submariner-io/shipyard/gh-actions/post-mortem@devel
uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.18
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
BASE_BRANCH ?= devel
BASE_BRANCH ?= release-0.18
export BASE_BRANCH

ifneq (,$(DAPPER_HOST_ARCH))
Expand Down

0 comments on commit 4812156

Please sign in to comment.