Skip to content

Commit 05801fa

Browse files
committed
add release-1.8/1.9/1.10 to scheduled e2e (#2224)
1 parent 267e4af commit 05801fa

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

Makefile

+8-7
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ SHELL = /bin/bash
33
REGISTRY = kubeovn
44
DEV_TAG = dev
55
RELEASE_TAG = $(shell cat VERSION)
6+
VERSION = $(shell echo $${VERSION:-$(RELEASE_TAG)})
67
COMMIT = git-$(shell git rev-parse --short HEAD)
78
DATE = $(shell date +"%Y-%m-%d_%H:%M:%S")
89
GOLDFLAGS = "-w -s -extldflags '-z now' -X github.com/kubeovn/kube-ovn/versions.COMMIT=$(COMMIT) -X github.com/kubeovn/kube-ovn/versions.VERSION=$(RELEASE_TAG) -X github.com/kubeovn/kube-ovn/versions.BUILDDATE=$(DATE)"
@@ -15,7 +16,7 @@ MULTUS_YAML = https://raw.githubusercontent.com/k8snetworkplumbingwg/multus-cni/
1516
CILIUM_VERSION = 1.11.6
1617
CILIUM_IMAGE_REPO = quay.io/cilium/cilium
1718

18-
VPC_NAT_GW_IMG = $(REGISTRY)/vpc-nat-gateway:$(RELEASE_TAG)
19+
VPC_NAT_GW_IMG = $(REGISTRY)/vpc-nat-gateway:$(VERSION)
1920

2021
E2E_NETWORK = bridge
2122
ifneq ($(VLAN_ID),)
@@ -158,16 +159,16 @@ define docker_config_bridge
158159
default=$$(docker network inspect $(1) -f '{{index .Options "com.docker.network.bridge.default_bridge"}}'); \
159160
br="docker0"; \
160161
[ "$$default" != "true" ] && br="br-$$(docker network inspect $(1) -f "{{.Id}}" | head -c 12)"; \
161-
docker run --rm --privileged --network=host $(REGISTRY)/kube-ovn:$(RELEASE_TAG) bash -ec '\
162+
docker run --rm --privileged --network=host $(REGISTRY)/kube-ovn:$(VERSION) bash -ec '\
162163
for brif in $$(ls /sys/class/net/'$$br'/brif); do \
163164
echo $(2) > /sys/class/net/'$$br'/brif/$$brif/hairpin_mode; \
164165
done'; \
165166
if [ -z "$(3)" ]; then \
166-
docker run --rm --privileged --network=host $(REGISTRY)/kube-ovn:$(RELEASE_TAG) bash -ec '\
167+
docker run --rm --privileged --network=host $(REGISTRY)/kube-ovn:$(VERSION) bash -ec '\
167168
echo 0 > /sys/class/net/'$$br'/bridge/vlan_filtering; \
168169
'; \
169170
else \
170-
docker run --rm --privileged --network=host $(REGISTRY)/kube-ovn:$(RELEASE_TAG) bash -ec '\
171+
docker run --rm --privileged --network=host $(REGISTRY)/kube-ovn:$(VERSION) bash -ec '\
171172
echo 1 > /sys/class/net/'$$br'/bridge/vlan_filtering; \
172173
bridge vlan show | awk "/^'$$br'/{print \$$2; while (getline > 0) {\
173174
if (\$$0 ~ /^[[:blank:]]/) {print \$$1} else {exit 0} }\
@@ -252,7 +253,7 @@ kind-init-cilium:
252253

253254
.PHONY: kind-load-image
254255
kind-load-image:
255-
$(call kind_load_image,kube-ovn,$(REGISTRY)/kube-ovn:$(RELEASE_TAG))
256+
$(call kind_load_image,kube-ovn,$(REGISTRY)/kube-ovn:$(VERSION))
256257

257258
.PHONY: kind-untaint-control-plane
258259
kind-untaint-control-plane:
@@ -287,7 +288,7 @@ kind-install-overlay-ipv4: kind-install
287288

288289
.PHONY: kind-install-ovn-ic
289290
kind-install-ovn-ic: kind-load-image kind-install
290-
$(call kind_load_image,kube-ovn1,$(REGISTRY)/kube-ovn:$(RELEASE_TAG))
291+
$(call kind_load_image,kube-ovn1,$(REGISTRY)/kube-ovn:$(VERSION))
291292
kubectl config use-context kind-kube-ovn1
292293
sed -e 's/10.16.0/10.18.0/g' \
293294
-e 's/10.96.0/10.98.0/g' \
@@ -296,7 +297,7 @@ kind-install-ovn-ic: kind-load-image kind-install
296297
bash
297298
kubectl describe no
298299

299-
docker run -d --name ovn-ic-db --network kind $(REGISTRY)/kube-ovn:$(RELEASE_TAG) bash start-ic-db.sh
300+
docker run -d --name ovn-ic-db --network kind $(REGISTRY)/kube-ovn:$(VERSION) bash start-ic-db.sh
300301
@set -e; \
301302
ic_db_host=$$(docker inspect ovn-ic-db -f "{{.NetworkSettings.Networks.kind.IPAddress}}"); \
302303
zone=az0 ic_db_host=$$ic_db_host gateway_node_name=kube-ovn-control-plane j2 yamls/ovn-ic.yaml.j2 -o ovn-ic-0.yaml; \

0 commit comments

Comments
 (0)