luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

upgrade test: fix on-the-fly-image build and downsize runner (#17331)

This commit is contained in:
cskh 2023-05-15 09:33:05 -04:00 committed by GitHub
parent 7abd829d0b
commit 2f18616aa7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/test-integrations.yml vendored
View File

@ -514,7 +514,7 @@ jobs:
} >> "$GITHUB_OUTPUT"
upgrade-integration-test:
runs-on: ${{ fromJSON(needs.setup.outputs.compute-xl) }}
runs-on: ${{ fromJSON(needs.setup.outputs.compute-large) }}
needs:
- setup
- dev-build
@ -548,6 +548,8 @@ jobs:
run: docker build -t consul-envoy:latest-version --build-arg CONSUL_IMAGE=docker.mirror.hashicorp.services/${{ env.CONSUL_LATEST_IMAGE_NAME }}:${{ env.CONSUL_LATEST_VERSION }} --build-arg ENVOY_VERSION=${{ env.ENVOY_VERSION }} -f ./test/integration/consul-container/assets/Dockerfile-consul-envoy ./test/integration/consul-container/assets
- name: Build consul-envoy:target-version image
run: docker build -t consul-envoy:target-version --build-arg CONSUL_IMAGE=${{ env.CONSUL_LATEST_IMAGE_NAME }}:local --build-arg ENVOY_VERSION=${{ env.ENVOY_VERSION }} -f ./test/integration/consul-container/assets/Dockerfile-consul-envoy ./test/integration/consul-container/assets
- name: Build sds image
run: docker build -t consul-sds-server ./test/integration/connect/envoy/test-sds-server/
- name: Configure GH workaround for ipv6 loopback
if: ${{ !endsWith(github.repository, '-enterprise') }}
run: |
@ -566,7 +568,7 @@ jobs:
--raw-command \
--format=short-verbose \
--debug \
--rerun-fails=3 \
--rerun-fails=2 \
--packages="./..." \
-- \
go test \

6
test/integration/consul-container/test/upgrade/ingress_gateway_sds_test.go
View File

@ -22,6 +22,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/testcontainers/testcontainers-go"
"github.com/testcontainers/testcontainers-go/wait"
)
const sdsServerPort = 1234
@ -313,9 +314,7 @@ func createSDSServer(t *testing.T, cluster *libcluster.Cluster) (containerName s
_, err = testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
Started: true,
ContainerRequest: testcontainers.ContainerRequest{
FromDockerfile: testcontainers.FromDockerfile{
Context: sdsServerFilesPath,
},
Image: "consul-sds-server",
Name: containerName,
Networks: []string{
cluster.NetworkName,
@ -332,6 +331,7 @@ func createSDSServer(t *testing.T, cluster *libcluster.Cluster) (containerName s
ReadOnly: true,
},
},
WaitingFor: wait.ForLog("").WithStartupTimeout(60 * time.Second),
},
})
require.NoError(t, err, "create SDS server container")