Merge pull request #481 from anarkiwi/rel2

Update compose.
IQTLabs · Aug 26, 2021 · 1d8b748 · 1d8b748
2 parents 835f66d + 48aad21
commit 1d8b748
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/codecheck-requirements.txt b/codecheck-requirements.txt
@@ -1 +1,2 @@
 pytype==2021.8.24
+ruamel.yaml==0.17.14
diff --git 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/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
diff --git 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()