diff --git a/framework/python/src/core/testrun.py b/framework/python/src/core/testrun.py index 5ca763c93..9ce9ef417 100644 --- a/framework/python/src/core/testrun.py +++ b/framework/python/src/core/testrun.py @@ -479,4 +479,4 @@ def _stop_ui(self): if container is not None: container.kill() except docker.errors.NotFound: - return + return \ No newline at end of file diff --git a/testing/baseline/test_baseline b/testing/baseline/test_baseline index f64c580ba..dab23620d 100755 --- a/testing/baseline/test_baseline +++ b/testing/baseline/test_baseline @@ -67,8 +67,8 @@ if [[ $i -eq $WAITING ]]; then exit 1 fi -# Load Test Container -sudo docker run --network=endev0 --cap-add=NET_ADMIN -v /tmp:/out --privileged ci1 +# Start test container +sudo docker run --network=endev0 --cap-add=NET_ADMIN -v /tmp:/out --privileged ci1 echo "Done baseline test" diff --git a/testing/baseline/test_baseline.py b/testing/baseline/test_baseline.py index ed3bb17a1..20b52e3f1 100644 --- a/testing/baseline/test_baseline.py +++ b/testing/baseline/test_baseline.py @@ -57,9 +57,11 @@ def test_assigned_ipv4_address(container_data): def test_ntp_server_reachable(container_data): assert not 'no servers' in container_data['ntp_offset'] +@pytest.mark.skip(reason='requires internet') def test_dns_server_reachable(container_data): assert not 'no servers' in container_data['dns_response'] +@pytest.mark.skip(reason='requires internet') def test_dns_server_resolves(container_data): assert re.match(r'[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}', container_data['dns_response']) diff --git a/testing/docker/ci_baseline/entrypoint.sh b/testing/docker/ci_baseline/entrypoint.sh index 0f3301cd8..ab43f0dd0 100755 --- a/testing/docker/ci_baseline/entrypoint.sh +++ b/testing/docker/ci_baseline/entrypoint.sh @@ -37,6 +37,13 @@ if [ -f $PID_FILE ]; then kill -9 $(cat $PID_FILE) || true rm -f $PID_FILE fi + +# Set MAC address to match the only_baseline +# device_config in testing folder +desired_mac="02:42:aa:00:01:01" +ip link set dev eth0 address $desired_mac + + dhclient -v eth0 echo "{}" > $OUT