diff --git a/.github/workflows/branch.yml b/.github/workflows/branch.yml index 1a9dc9b0..e7445061 100644 --- a/.github/workflows/branch.yml +++ b/.github/workflows/branch.yml @@ -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 diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 2ef9c079..e234ec92 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -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: @@ -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 @@ -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 diff --git a/.github/workflows/flake_finder.yml b/.github/workflows/flake_finder.yml index 920fe8e4..c0145da0 100644 --- a/.github/workflows/flake_finder.yml +++ b/.github/workflows/flake_finder.yml @@ -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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f5472e56..a11d2d41 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,7 +5,7 @@ on: workflow_dispatch: push: branches: - - devel + - release-0.18 - release-* permissions: {} @@ -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 }} diff --git a/.github/workflows/report.yml b/.github/workflows/report.yml index 93882225..17816fee 100644 --- a/.github/workflows/report.yml +++ b/.github/workflows/report.yml @@ -4,7 +4,7 @@ name: Reporting on: push: branches: - - devel + - release-0.18 - release-* permissions: {} diff --git a/.github/workflows/upgrade-e2e.yml b/.github/workflows/upgrade-e2e.yml index 3c620292..f45db609 100644 --- a/.github/workflows/upgrade-e2e.yml +++ b/.github/workflows/upgrade-e2e.yml @@ -3,7 +3,7 @@ name: Upgrade on: pull_request: - branches: [devel] + branches: [release-0.18] permissions: {} @@ -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 diff --git a/Makefile b/Makefile index 51079aea..3e92da49 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -BASE_BRANCH ?= devel +BASE_BRANCH ?= release-0.18 export BASE_BRANCH ifneq (,$(DAPPER_HOST_ARCH))