From ce66433311de62d1a2cc55a5f25ec2095a3163da Mon Sep 17 00:00:00 2001
From: cskh <hui.kang@hashicorp.com>
Date: Fri, 17 Nov 2023 12:34:30 -0500
Subject: [PATCH] integ-test: fix upgrade test for CE (#19673)

* integ-test: fix upgrade test for CE
---
 .github/workflows/nightly-test-integrations.yml |  3 +--
 test-integ/upgrade/basic/common.go              | 10 ++++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/nightly-test-integrations.yml b/.github/workflows/nightly-test-integrations.yml
index 44814ee85d..74cc5a77a0 100644
--- a/.github/workflows/nightly-test-integrations.yml
+++ b/.github/workflows/nightly-test-integrations.yml
@@ -406,7 +406,6 @@ jobs:
     runs-on: ${{ fromJSON(needs.setup.outputs.compute-large ) }}
     needs:
       - setup
-      - dev-build
     permissions:
       id-token: write # NOTE: this permission is explicitly required for Vault auth.
       contents: read
@@ -445,7 +444,7 @@ jobs:
             -- \
             go test \
             -tags "${{ env.GOTAGS }}" \
-            -timeout=60m \
+            -timeout=20m \
             -parallel=2 \
             -json \
             ./... \
diff --git a/test-integ/upgrade/basic/common.go b/test-integ/upgrade/basic/common.go
index a7b44d5adf..dab3522a58 100644
--- a/test-integ/upgrade/basic/common.go
+++ b/test-integ/upgrade/basic/common.go
@@ -161,12 +161,12 @@ func newCommonTopo(t *testing.T) *commonTopo {
 						},
 					},
 				},
-				Enterprise: true,
+				Enterprise: utils.IsEnterprise(),
 				InitialConfigEntries: []api.ConfigEntry{
 					&api.ProxyConfigEntry{
 						Kind:      api.ProxyDefaults,
 						Name:      "global",
-						Partition: "default",
+						Partition: topoutil.ConfigEntryPartition("default"),
 						Config: map[string]any{
 							"protocol": "http",
 						},
@@ -174,14 +174,12 @@ func newCommonTopo(t *testing.T) *commonTopo {
 					&api.ServiceConfigEntry{
 						Kind:      api.ServiceDefaults,
 						Name:      "static-server",
-						Partition: "default",
-						Namespace: "default",
+						Partition: topoutil.ConfigEntryPartition("default"),
 					},
 					&api.ServiceIntentionsConfigEntry{
 						Kind:      api.ServiceIntentions,
 						Name:      "static-server",
-						Partition: "default",
-						Namespace: "default",
+						Partition: topoutil.ConfigEntryPartition("default"),
 						Sources: []*api.SourceIntention{
 							{
 								Name:   "static-client",