From 06d612d897294de17998f7179520f046b5031b63 Mon Sep 17 00:00:00 2001 From: Josh Bailey Date: Thu, 26 Aug 2021 13:30:10 +1200 Subject: [PATCH 1/3] Update compose. --- docker-compose.yml | 4 +--- tests/lib_test.sh | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3dd62e76..11b0a2f9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.7' services: plugin: restart: always - image: iqtlabs/dovesnap:latest + image: iqtlabs/dovesnap:v1.0.0 volumes: - /run/docker/plugins:/run/docker/plugins - /var/run/docker.sock:/var/run/docker.sock @@ -32,8 +32,6 @@ services: - '--stacking_interfaces=${STACKING_INTERFACES}' - '--stack_mirror_interface=${STACK_MIRROR_INTERFACE}' - '--default_ofcontrollers=${STACK_OFCONTROLLERS}' - build: - context: . labels: - "dovesnap.namespace=primary" ovs: diff --git a/tests/lib_test.sh b/tests/lib_test.sh index 7704af24..662f9828 100644 --- a/tests/lib_test.sh +++ b/tests/lib_test.sh @@ -56,6 +56,8 @@ init_dirs() fi mkdir -p $TMPDIR/etc/faucet MIRROR_PCAP=$TMPDIR/mirror.cap + sed -i -E 's/version = "([0-9\.]+)"/version = "\1.dev"/g' main.go || exit 1 + cd release && ./update_docker_compose.py && cd .. || exit 1 } clean_dirs() From 928fee2843390cd4df854b65ee61215cb874fe2a Mon Sep 17 00:00:00 2001 From: Josh Bailey Date: Thu, 26 Aug 2021 14:03:53 +1200 Subject: [PATCH 2/3] Need ruamel.yaml. --- codecheck-requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/codecheck-requirements.txt b/codecheck-requirements.txt index 4a948f52..ffd93c57 100644 --- a/codecheck-requirements.txt +++ b/codecheck-requirements.txt @@ -1 +1,2 @@ pytype==2021.8.24 +ruamel.yaml==0.17.14 From 48aad21f3fbffb06dd4889056e29fff3020c94a9 Mon Sep 17 00:00:00 2001 From: Josh Bailey Date: Thu, 26 Aug 2021 14:07:07 +1200 Subject: [PATCH 3/3] install codecheck. --- tests/install_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/install_test.sh b/tests/install_test.sh index 064e800e..f88908e8 100755 --- a/tests/install_test.sh +++ b/tests/install_test.sh @@ -10,4 +10,4 @@ sudo modprobe openvswitch && \ curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - && \ sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" && \ sudo apt-get update && sudo apt-get install docker-ce docker-ce-cli containerd.io wget graphviz python3-setuptools python3-dev udhcpd jq && \ - sudo pip3 install -r requirements.txt + sudo pip3 install -r requirements.txt && pip3 install -r codecheck-requirements.txt