Skip to content

Commit a974255

Browse files
authored
Merge pull request #295 from songjiaxun/azurestack
fix: only deploy test pods on Linux nodes
2 parents 4e84b7d + fcc8e90 commit a974255

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,9 @@ blob-container:
9696
docker buildx rm container-builder || true
9797
docker buildx create --use --name=container-builder
9898
ifdef CI
99+
ifdef AZURE_STACK
100+
docker run --privileged --name buildx_buildkit_container-builder0 -d --mount type=bind,src=/etc/ssl/certs,dst=/etc/ssl/certs moby/buildkit:latest || true
101+
endif
99102
docker buildx build --no-cache --build-arg LDFLAGS=${LDFLAGS} -t $(IMAGE_TAG) -f ./pkg/blobplugin/Dockerfile --platform="linux/amd64" --push .
100103

101104
docker manifest create $(IMAGE_TAG) $(IMAGE_TAG)

test/e2e/testsuites/testsuites.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,7 @@ func NewTestDeployment(c clientset.Interface, ns *v1.Namespace, command string,
317317
Labels: map[string]string{"app": selectorValue},
318318
},
319319
Spec: v1.PodSpec{
320+
NodeSelector: map[string]string{"kubernetes.io/os": "linux"},
320321
Containers: []v1.Container{
321322
{
322323
Name: "volume-tester",
@@ -426,6 +427,7 @@ func NewTestPod(c clientset.Interface, ns *v1.Namespace, command string) *TestPo
426427
GenerateName: "blob-volume-tester-",
427428
},
428429
Spec: v1.PodSpec{
430+
NodeSelector: map[string]string{"kubernetes.io/os": "linux"},
429431
Containers: []v1.Container{
430432
{
431433
Name: "volume-tester",

0 commit comments

Comments
 (0)