From 1fbd59875b9b38ca31f7a1894b2abbfde4908563 Mon Sep 17 00:00:00 2001 From: hc-github-team-consul-core Date: Mon, 6 Nov 2023 16:00:05 -0600 Subject: [PATCH] Backport of Ci upgrade test 1 17 into release/1.17.x (#19537) * backport of commit b229e292fef95406d9fc60113bbbb04f9634a5c2 * keep upgrade test from 1.15 * keep envoy version --------- Co-authored-by: cskh --- .github/workflows/nightly-test-integrations.yml | 2 +- .../consul-container/test/upgrade/catalog/catalog_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly-test-integrations.yml b/.github/workflows/nightly-test-integrations.yml index 7fa1ec1f48..a350ca1e7d 100644 --- a/.github/workflows/nightly-test-integrations.yml +++ b/.github/workflows/nightly-test-integrations.yml @@ -193,7 +193,7 @@ jobs: strategy: fail-fast: false matrix: - consul-version: [ "1.15", "1.16"] + consul-version: [ "1.15", "1.16", "1.17"] env: CONSUL_LATEST_VERSION: ${{ matrix.consul-version }} ENVOY_VERSION: "1.24.6" diff --git a/test/integration/consul-container/test/upgrade/catalog/catalog_test.go b/test/integration/consul-container/test/upgrade/catalog/catalog_test.go index 61c479c989..ae8ed0401a 100644 --- a/test/integration/consul-container/test/upgrade/catalog/catalog_test.go +++ b/test/integration/consul-container/test/upgrade/catalog/catalog_test.go @@ -60,7 +60,7 @@ func TestCatalogUpgrade(t *testing.T) { cluster, _, _ := topology.NewCluster(t, &topology.ClusterConfig{ NumServers: 1, BuildOpts: buildOpts, - ApplyDefaultProxySettings: true, + ApplyDefaultProxySettings: false, Cmd: `-hcl=experiments=["resource-apis"]`, })