Merge back v2.11 into v3.0
This commit is contained in:
commit
f57cee578f
4
.github/workflows/build.yaml
vendored
4
.github/workflows/build.yaml
vendored
|
@ -12,7 +12,7 @@ env:
|
||||||
jobs:
|
jobs:
|
||||||
|
|
||||||
build-webui:
|
build-webui:
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-22.04
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Check out code
|
- name: Check out code
|
||||||
|
@ -35,7 +35,7 @@ jobs:
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
os: [ ubuntu-20.04, macos-latest, windows-latest ]
|
os: [ ubuntu-22.04, macos-latest, windows-latest ]
|
||||||
needs:
|
needs:
|
||||||
- build-webui
|
- build-webui
|
||||||
|
|
||||||
|
|
2
.github/workflows/check_doc.yml
vendored
2
.github/workflows/check_doc.yml
vendored
|
@ -9,7 +9,7 @@ jobs:
|
||||||
|
|
||||||
docs:
|
docs:
|
||||||
name: Check, verify and build documentation
|
name: Check, verify and build documentation
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-22.04
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Check out code
|
- name: Check out code
|
||||||
|
|
2
.github/workflows/documentation.yml
vendored
2
.github/workflows/documentation.yml
vendored
|
@ -14,7 +14,7 @@ jobs:
|
||||||
|
|
||||||
docs:
|
docs:
|
||||||
name: Doc Process
|
name: Doc Process
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-22.04
|
||||||
if: github.repository == 'traefik/traefik'
|
if: github.repository == 'traefik/traefik'
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
|
2
.github/workflows/experimental.yaml
vendored
2
.github/workflows/experimental.yaml
vendored
|
@ -15,7 +15,7 @@ jobs:
|
||||||
experimental:
|
experimental:
|
||||||
if: github.repository == 'traefik/traefik'
|
if: github.repository == 'traefik/traefik'
|
||||||
name: Build experimental image on branch
|
name: Build experimental image on branch
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-22.04
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
|
||||||
|
|
4
.github/workflows/test-integration.yaml
vendored
4
.github/workflows/test-integration.yaml
vendored
|
@ -15,7 +15,7 @@ env:
|
||||||
jobs:
|
jobs:
|
||||||
|
|
||||||
build:
|
build:
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-22.04
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Check out code
|
- name: Check out code
|
||||||
|
@ -35,7 +35,7 @@ jobs:
|
||||||
run: make binary
|
run: make binary
|
||||||
|
|
||||||
test-integration:
|
test-integration:
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-22.04
|
||||||
needs:
|
needs:
|
||||||
- build
|
- build
|
||||||
strategy:
|
strategy:
|
||||||
|
|
2
.github/workflows/test-unit.yaml
vendored
2
.github/workflows/test-unit.yaml
vendored
|
@ -11,7 +11,7 @@ env:
|
||||||
jobs:
|
jobs:
|
||||||
|
|
||||||
test-unit:
|
test-unit:
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-22.04
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Check out code
|
- name: Check out code
|
||||||
|
|
4
.github/workflows/validate.yaml
vendored
4
.github/workflows/validate.yaml
vendored
|
@ -13,7 +13,7 @@ env:
|
||||||
jobs:
|
jobs:
|
||||||
|
|
||||||
validate:
|
validate:
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-22.04
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Check out code
|
- name: Check out code
|
||||||
|
@ -39,7 +39,7 @@ jobs:
|
||||||
run: make validate
|
run: make validate
|
||||||
|
|
||||||
validate-generate:
|
validate-generate:
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-22.04
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Check out code
|
- name: Check out code
|
||||||
|
|
|
@ -37,6 +37,8 @@ import (
|
||||||
|
|
||||||
var showLog = flag.Bool("tlog", false, "always show Traefik logs")
|
var showLog = flag.Bool("tlog", false, "always show Traefik logs")
|
||||||
|
|
||||||
|
const tailscaleSecretFilePath = "tailscale.secret"
|
||||||
|
|
||||||
type composeConfig struct {
|
type composeConfig struct {
|
||||||
Services map[string]composeService `yaml:"services"`
|
Services map[string]composeService `yaml:"services"`
|
||||||
}
|
}
|
||||||
|
@ -99,6 +101,11 @@ func (s *BaseSuite) displayTraefikLogFile(path string) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *BaseSuite) SetupSuite() {
|
func (s *BaseSuite) SetupSuite() {
|
||||||
|
if isDockerDesktop(context.Background(), s.T()) {
|
||||||
|
_, err := os.Stat(tailscaleSecretFilePath)
|
||||||
|
require.NoError(s.T(), err, "Tailscale need to be configured when running integration tests with Docker Desktop: (https://doc.traefik.io/traefik/v2.11/contributing/building-testing/#testing)")
|
||||||
|
}
|
||||||
|
|
||||||
// configure default standard log.
|
// configure default standard log.
|
||||||
stdlog.SetFlags(stdlog.Lshortfile | stdlog.LstdFlags)
|
stdlog.SetFlags(stdlog.Lshortfile | stdlog.LstdFlags)
|
||||||
// TODO
|
// TODO
|
||||||
|
@ -124,7 +131,7 @@ func (s *BaseSuite) SetupSuite() {
|
||||||
s.hostIP = "172.31.42.1"
|
s.hostIP = "172.31.42.1"
|
||||||
if isDockerDesktop(ctx, s.T()) {
|
if isDockerDesktop(ctx, s.T()) {
|
||||||
s.hostIP = getDockerDesktopHostIP(ctx, s.T())
|
s.hostIP = getDockerDesktopHostIP(ctx, s.T())
|
||||||
s.setupVPN("tailscale.secret")
|
s.setupVPN(tailscaleSecretFilePath)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue