topotests: Adapt docker changes for integrated tests

Signed-off-by: Christian Franke <chris@opensourcerouting.org>

Makefile.am

@@ -149,6 +149,7 @@ include yang/libyang_plugins/subdir.am
 
 include vtysh/subdir.am
 include tests/subdir.am
+include tests/topotests/subdir.am
 
 if PKGSRC
 rcdir=@pkgsrcrcdir@

tests/topotests/Dockerfile

@@ -71,7 +71,6 @@ RUN echo "" >> /etc/security/limits.conf; \
 
 # Copy run scripts to facilitate users wanting to run the tests
 COPY docker/inner /opt/topotests
-COPY . /root/topotests
 
 WORKDIR /root/topotests
 ENV PATH "$PATH:/opt/topotests"

tests/topotests/docker/build.sh

@@ -22,7 +22,9 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+cd "$(dirname "$0")"/..
+
 exec docker build --pull \
 		  --compress \
-		  -t frrouting/topotests \
+		  -t frrouting/frr:topotests-latest \
 		  .

tests/topotests/docker/frr-topotests.sh

@@ -61,9 +61,6 @@ if [[ "$1" = "-h" ]] || [[ "$1" = "--help" ]]; then
 	TOPOTEST_OPTIONS        These options are appended to the docker-run
 	                        command for starting the tests.
 
-	TOPOTEST_PATH           If set, don't use the tests built into the image
-	                        but the ones at the given path.
-
 	TOPOTEST_SANITIZER      Controls whether to use the address sanitizer.
 	                        Enabled by default, set to 0 to disable.
 
@@ -136,6 +133,7 @@ fi
 set -- --rm -ti \
 	-v "$TOPOTEST_LOGS:/tmp" \
 	-v "$TOPOTEST_FRR:/root/host-frr:ro" \
+	-v "$TOPOTEST_FRR/tests/topotests:/root/topotests:ro" \
 	-v "$TOPOTEST_BUILDCACHE:/root/persist" \
 	-e "TOPOTEST_CLEAN=$TOPOTEST_CLEAN" \
 	-e "TOPOTEST_VERBOSE=$TOPOTEST_VERBOSE" \
@@ -143,10 +141,6 @@ set -- --rm -ti \
 	-e "TOPOTEST_SANITIZER=$TOPOTEST_SANITIZER" \
 	--privileged \
 	$TOPOTEST_OPTIONS \
-	frrouting/topotests "$@"
-
-if [ -n "$TOPOTEST_PATH" ]; then
-	set -- -v "$TOPOTEST_PATH:/root/topotests:ro" "$@"
-fi
+	frrouting/frr:topotests-latest "$@"
 
 exec docker run "$@"

tests/topotests/subdir.am

@@ -0,0 +1,7 @@
+TOPOTESTS_DIR = tests/topotests
+
+topotests-build: ## Builds docker images for topotests
+	$(TOPOTESTS_DIR)/docker/build.sh
+
+topotests: ## Runs topotests
+	$(TOPOTESTS_DIR)/docker/frr-topotests.sh