2 files changed, 16 insertions, 15 deletions
diff --git a/docker/ubuntu-ci/Dockerfile b/docker/ubuntu-ci/Dockerfile
index 5a49806..5c4649d 100644
--- a/docker/ubuntu-ci/Dockerfile
+++ b/docker/ubuntu-ci/Dockerfile
@@ -23,13 +23,17 @@ RUN apt update && apt upgrade -y && \
             libreadline-dev \
             libsnmp-dev \
             libsqlite3-dev \
+            lsb-release \
             libtool \
+            lcov \
             make \
             perl \
             pkg-config \
             python3-dev \
             python3-sphinx \
+            screen \
             texinfo \
+            tmux \
     && \
     # Protobuf build requirements
     apt-get install -y \
@@ -89,18 +93,14 @@ RUN groupadd -r -g 92 frr && \
       echo 'frr ALL = NOPASSWD: ALL' | tee /etc/sudoers.d/frr && \
       mkdir -p /home/frr && chown frr.frr /home/frr
 
-USER frr:frr
+# Install FRR built packages
+RUN mkdir -p /etc/apt/keyrings && \
+    curl -s -o /etc/apt/keyrings/frrouting.gpg https://deb.frrouting.org/frr/keys.gpg && \
+    echo deb '[signed-by=/etc/apt/keyrings/frrouting.gpg]' https://deb.frrouting.org/frr \
+        $(lsb_release -s -c) "frr-stable" > /etc/apt/sources.list.d/frr.list && \
+    apt-get update && apt-get install -y librtr-dev libyang2-dev libyang2-tools
 
-# build and install libyang2
-RUN cd && pwd && ls -al && \
-    git clone https://github.com/CESNET/libyang.git && \
-    cd libyang && \
-    git checkout v2.1.128 && \
-    mkdir build; cd build && \
-    cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-          -DCMAKE_BUILD_TYPE:String="Release" .. && \
-    make -j $(nproc) && \
-    sudo make install
+USER frr:frr
 
 COPY --chown=frr:frr . /home/frr/frr/
 
@@ -111,6 +111,10 @@ RUN cd ~/frr && \
        --sysconfdir=/etc \
        --localstatedir=/var \
        --sbindir=/usr/lib/frr \
+       --enable-gcov \
+       --enable-dev-build \
+       --enable-mgmtd-test-be-client \
+       --enable-rpki \
        --enable-sharpd \
        --enable-multipath=64 \
        --enable-user=frr \
diff --git a/docker/ubuntu-ci/docker-start b/docker/ubuntu-ci/docker-start
index 9a45c72..c383ea8 100755
--- a/docker/ubuntu-ci/docker-start
+++ b/docker/ubuntu-ci/docker-start
@@ -1,8 +1,5 @@
 #!/bin/bash
-
 if [ $(uname -a | grep -ci Ubuntu) -ge 1 ]; then
-    #for topotests under ubuntu host
-    sudo modprobe mpls-router mpls-iptunnel
-    sudo /etc/init.d/openvswitch-switch start
+    sudo modprobe mpls-router mpls-iptunnel vrf
 fi
 while true ; do sleep 365d ; done