diff --git a/.github/workflows/branch.yml b/.github/workflows/branch.yml index c08bc1c..3ae2424 100644 --- a/.github/workflows/branch.yml +++ b/.github/workflows/branch.yml @@ -6,9 +6,9 @@ on: jobs: target_devel: - name: PR targets devel + name: PR targets release-0.9 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.9 + if: ${{ github.base_ref != 'release-0.9' }} run: exit 1 diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index b705eac..b9cd08d 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -26,11 +26,11 @@ jobs: uses: actions/checkout@v2 - name: Run E2E deployment and tests - uses: submariner-io/shipyard/gh-actions/e2e@devel + uses: submariner-io/shipyard/gh-actions/e2e@release-0.9 with: k8s_version: ${{ matrix.k8s_version }} using: ${{ matrix.cable_driver }} ${{ matrix.globalnet }} ${{ matrix.lighthouse }} - name: Post mortem if: failure() - uses: submariner-io/shipyard/gh-actions/post-mortem@devel + uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.9 diff --git a/.github/workflows/flake_finder.yml b/.github/workflows/flake_finder.yml index ff716de..b078438 100644 --- a/.github/workflows/flake_finder.yml +++ b/.github/workflows/flake_finder.yml @@ -21,10 +21,10 @@ jobs: uses: actions/checkout@v2 - name: Run E2E deployment and tests - uses: submariner-io/shipyard/gh-actions/e2e@devel + uses: submariner-io/shipyard/gh-actions/e2e@release-0.9 with: using: ${{ matrix.cable_driver }} ${{ matrix.globalnet }} ${{ matrix.lighthouse }} - name: Post mortem if: failure() - uses: submariner-io/shipyard/gh-actions/post-mortem@devel + uses: submariner-io/shipyard/gh-actions/post-mortem@release-0.9 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0a40350..9637d27 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,7 +4,7 @@ name: Release Charts on: push: branches: - - devel + - release-0.9 jobs: release: diff --git a/Dockerfile.dapper b/Dockerfile.dapper index d65e66b..f230d7f 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -1,5 +1,5 @@ ARG BASE_BRANCH -FROM quay.io/submariner/shipyard-dapper-base:${BASE_BRANCH} +FROM quay.io/submariner/shipyard-dapper-base:release-0.9 ARG DAPPER_HOST_ARCH ENV HOST_ARCH=${DAPPER_HOST_ARCH} ARCH=${DAPPER_HOST_ARCH} \ diff --git a/Makefile b/Makefile index 40d4c84..62a8fb1 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -BASE_BRANCH ?= devel +BASE_BRANCH ?= release-0.9 export BASE_BRANCH ifneq (,$(DAPPER_HOST_ARCH))