diff --git a/.github/workflows/branch.yml b/.github/workflows/branch.yml index 1a9dc9b0..1e2e1f11 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.17 + if: ${{ github.base_ref != 'release-0.17' }} run: exit 1 diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 89be8377..1946600b 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -16,8 +16,8 @@ jobs: uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - name: Run E2E deployment and tests - uses: submariner-io/shipyard/gh-actions/e2e@devel + uses: submariner-io/shipyard/gh-actions/e2e@release-0.17 - name: Post mortem if: failure() - uses: submariner-io/shipyard/gh-actions/post-mortem@devel + uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.17 diff --git a/.github/workflows/flake_finder.yml b/.github/workflows/flake_finder.yml index eaaf2d59..f2fac824 100644 --- a/.github/workflows/flake_finder.yml +++ b/.github/workflows/flake_finder.yml @@ -18,11 +18,11 @@ jobs: uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - name: Run E2E deployment and tests - uses: submariner-io/shipyard/gh-actions/e2e@devel + uses: submariner-io/shipyard/gh-actions/e2e@release-0.17 - name: Post mortem if: failure() - uses: submariner-io/shipyard/gh-actions/post-mortem@devel + uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.17 - name: Raise an issue to report flaky test failure if: ${{ failure() }} diff --git a/.github/workflows/report.yml b/.github/workflows/report.yml index 2e0b88ab..c5d1b473 100644 --- a/.github/workflows/report.yml +++ b/.github/workflows/report.yml @@ -4,7 +4,7 @@ name: Reporting on: push: branches: - - devel + - release-0.17 - release-* permissions: {} diff --git a/Makefile b/Makefile index eaaa38c3..bc780362 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -BASE_BRANCH ?= devel +BASE_BRANCH ?= release-0.17 export BASE_BRANCH ifneq (,$(DAPPER_HOST_ARCH))