Skip to content

Commit 2cccb36

Browse files
committed
Prepare v2.22.0-test.2
Signed-off-by: Thomas Hallgren <[email protected]>
1 parent 47b291d commit 2cccb36

File tree

3 files changed

+20
-6
lines changed

3 files changed

+20
-6
lines changed

.github/workflows/dev.yaml

+18-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ env:
1010

1111
jobs:
1212
build_images:
13-
if: github.event.label.name == 'ok to test'
13+
if: github.event.label.name == 'ok to test' || github.event.label.name == 'compatibility test'
1414
runs-on: ubuntu-latest
1515
outputs:
1616
telepresenceVersion: ${{ steps.version.outputs.version }}
@@ -55,7 +55,7 @@ jobs:
5555
run: docker logout
5656

5757
run_tests:
58-
if: github.event.label.name == 'ok to test'
58+
if: github.event.label.name == 'ok to test' || github.event.label.name == 'compatibility test'
5959
strategy:
6060
fail-fast: false
6161
matrix:
@@ -81,8 +81,22 @@ jobs:
8181
- name: Build client
8282
run: make build
8383
- name: Run integration tests
84+
if: github.event.label.name == 'ok to test'
85+
uses: nick-fields/retry/@v3
86+
with:
87+
max_attempts: 3
88+
shell: bash
89+
timeout_minutes: 90
90+
command: |
91+
set -ex
92+
if [[ ${RUNNER_OS} == "Windows" ]]; then
93+
export PATH="$PATH:/C/Program Files/SSHFS-Win/bin:$HOME/kubectl-plugins"
94+
fi
95+
DEV_TELEPRESENCE_VERSION=${TELEPRESENCE_VERSION} DTEST_KUBECONFIG="${HOME}/.kube/config" make check-integration
96+
- name: Run compatibility tests
97+
if: github.event.label.name == 'compatibility test'
8498
env:
85-
SCOUT_DISABLE: "1"
99+
DEV_COMPAT_VERSION: "2.21.3"
86100
uses: nick-fields/retry/@v3
87101
with:
88102
max_attempts: 3
@@ -99,7 +113,7 @@ jobs:
99113
LOG_SUFFIX: "${{ runner.os }}-${{ runner.arch }}-${{ matrix.clusters.distribution }}-${{ matrix.clusters.version }}"
100114
if: always()
101115
purge_images:
102-
if: github.event.label.name == 'ok to test'
116+
if: github.event.label.name == 'ok to test' || github.event.label.name == 'compatibility test'
103117
runs-on: ubuntu-latest
104118
permissions:
105119
packages: write

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ require (
3737
github.com/stretchr/testify v1.10.0
3838
github.com/telepresenceio/go-fuseftp v0.6.1
3939
github.com/telepresenceio/go-fuseftp/rpc v0.6.1
40-
github.com/telepresenceio/telepresence/rpc/v2 v2.21.1
40+
github.com/telepresenceio/telepresence/rpc/v2 v2.22.0-test.2
4141
github.com/vishvananda/netlink v1.3.0
4242
golang.org/x/net v0.35.0
4343
golang.org/x/sys v0.30.0

pkg/vif/testdata/router/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ require (
4949
github.com/rogpeppe/go-internal v1.13.1 // indirect
5050
github.com/spf13/cobra v1.8.1 // indirect
5151
github.com/spf13/pflag v1.0.6 // indirect
52-
github.com/telepresenceio/telepresence/rpc/v2 v2.21.1 // indirect
52+
github.com/telepresenceio/telepresence/rpc/v2 v2.22.0-test.2 // indirect
5353
github.com/vishvananda/netlink v1.3.0 // indirect
5454
github.com/vishvananda/netns v0.0.5 // indirect
5555
github.com/x448/float16 v0.8.4 // indirect

0 commit comments

Comments
 (0)