Merge pull request #13649 from donaldsharp/unlock_the_node_or_else

[mirror_frr.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 84dd2d7ec283e2f65aeb57bcdb1782ecefa662cc..32b686c00e7231ba8cc6651d30ff8353e1941001 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,14 +5,14 @@ services:
   - docker
 jobs:
   include:
-   # - script:
-   #     - docker/centos-7/build.sh
-   #     - docker images
-   #   name: centos7
-   # - script:
-   #     - docker/centos-8/build.sh
-   #     - docker images
-   #   name: centos8
+   - script:
+       - docker/centos-7/build.sh
+       - docker images
+     name: centos7
+   - script:
+       - docker/centos-8/build.sh
+       - docker images
+     name: centos8
    - script:
        - sudo apt install -y linux-modules-extra-$(uname -r)
        - docker build -t frr-ubuntu18:latest -f docker/ubuntu18-ci/Dockerfile .
@@ -22,7 +22,7 @@ jobs:
        - docker ps
        - docker exec frr-ubuntu18 bash -c 'cd ~/frr ; make check'
        - docker exec frr-ubuntu18 bash -c 'ps agxu ; lsmod | grep mpls || true'
-       - docker exec frr-ubuntu18 bash -c 'cd ~/frr/tests/topotests/ospf-topo1 ; sudo pytest test_ospf_topo1.py'
+       - docker exec frr-ubuntu18 bash -c 'cd ~/frr/tests/topotests/ospf_topo1 ; sudo pytest test_ospf_topo1.py'
        - docker exec frr-ubuntu18 bash -c 'cd ~/frr/tests/topotests/bgp_l3vpn_to_bgp_vrf ; sudo pytest test_bgp_l3vpn_to_bgp_vrf.py'
      name: ubuntu18+minimalCI
    - script:
@@ -34,7 +34,7 @@ jobs:
        - docker ps
        - docker exec frr-ubuntu20 bash -c 'cd ~/frr ; make check'
        - docker exec frr-ubuntu20 bash -c 'ps agxu ; lsmod | grep mpls || true'
-       - docker exec frr-ubuntu20 bash -c 'cd ~/frr/tests/topotests/ospf-topo1 ; sudo pytest test_ospf_topo1.py'
+       - docker exec frr-ubuntu20 bash -c 'cd ~/frr/tests/topotests/ospf_topo1 ; sudo pytest test_ospf_topo1.py'
        - docker exec frr-ubuntu20 bash -c 'cd ~/frr/tests/topotests/bgp_l3vpn_to_bgp_vrf ; sudo pytest test_bgp_l3vpn_to_bgp_vrf.py'
      name: ubuntu20+minimalCI