CI: Cleanup tests for single protocol builds

BFD and MRT can be built independently, only BMP requires BGP.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a4eeb41cf19e3a43d5d1dfe79c20071fc7b6ac65..58f1e6c339e4f5d4fb7186b80a4277f1e1e05de2 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -203,61 +203,36 @@ build-only-babel:
   variables:
     CONFIGURE_OPTIONS: --with-protocols=babel
 
-build-only-bgp:
+build-only-bfd:
   <<: *build-only
   variables:
-    CONFIGURE_OPTIONS: --with-protocols=bgp
+    CONFIGURE_OPTIONS: --with-protocols=bfd
 
-build-only-bgp-bfd:
+build-only-bgp:
   <<: *build-only
   variables:
-    CONFIGURE_OPTIONS: --with-protocols=bgp,bfd
+    CONFIGURE_OPTIONS: --with-protocols=bgp
 
 build-only-bgp-bmp:
   <<: *build-only
   variables:
     CONFIGURE_OPTIONS: --with-protocols=bgp,bmp
 
-build-only-bgp-bmp-bfd:
-  <<: *build-only
-  variables:
-    CONFIGURE_OPTIONS: --with-protocols=bgp,bmp,bfd
-
 build-only-l3vpn:
   <<: *build-only
   variables:
     CONFIGURE_OPTIONS: --with-protocols=l3vpn
 
-build-only-bgp-mrt:
-  <<: *build-only
-  variables:
-    CONFIGURE_OPTIONS: --with-protocols=bgp,mrt
-
-build-only-bgp-mrt-bfd:
-  <<: *build-only
-  variables:
-    CONFIGURE_OPTIONS: --with-protocols=bgp,mrt,bfd
-
-build-only-bgp-mrt-bmp:
-  <<: *build-only
-  variables:
-    CONFIGURE_OPTIONS: --with-protocols=bgp,mrt,bmp
-
-build-only-bgp-mrt-bmp-bfd:
+build-only-mrt:
   <<: *build-only
   variables:
-    CONFIGURE_OPTIONS: --with-protocols=bgp,mrt,bmp,bfd
+    CONFIGURE_OPTIONS: --with-protocols=mrt
 
 build-only-ospf:
   <<: *build-only
   variables:
     CONFIGURE_OPTIONS: --with-protocols=ospf
 
-build-only-ospf-bfd:
-  <<: *build-only
-  variables:
-    CONFIGURE_OPTIONS: --with-protocols=ospf,bfd
-
 build-only-pipe:
   <<: *build-only
   variables:
@@ -273,11 +248,6 @@ build-only-rip:
   variables:
     CONFIGURE_OPTIONS: --with-protocols=rip
 
-build-only-rip-bfd:
-  <<: *build-only
-  variables:
-    CONFIGURE_OPTIONS: --with-protocols=rip,bfd
-
 build-only-rpki:
   <<: *build-only
   variables: