Merge branch 'master' into mergebot-integration-branch/201814121030/3…

…949-3949

packages/dcos-integration-test/extra/test_metrics.py

@@ -281,6 +281,7 @@ def check_metrics_metadata():
 
 @pytest.mark.skipif(expanded_config.get('security') == 'strict',
                     reason="Framework disabled for strict mode")
+@common.xfailflake(reason="DCOS_OSS-4568 - Framework hello-world still running")
 def test_executor_metrics_metadata(dcos_api_session):
     """Test that executor metrics have expected metadata/labels"""
     with deploy_and_cleanup_dcos_package(dcos_api_session, 'hello-world', '2.2.0-0.42.2', 'hello-world'):
@@ -377,7 +378,7 @@ def wait_for_node_response(node):
         assert expected_dimension_response(response.json())
 
 
-@common.xfailflake(reason="DCOS_OSS-4486 - tgest_metrics_containers fails with container metrics response status 204")
+@common.xfailflake(reason="DCOS_OSS-4486 - test_metrics_containers fails with container metrics response status 204")
 def test_metrics_containers(dcos_api_session):
     """If there's a deployed container on the slave, iterate through them to check for
     the statsd-emitter executor. When found, query it's /app endpoint to test that

packages/dcos-integration-test/extra/test_networking.py

@@ -278,6 +278,12 @@ def test_vip_ipv6(dcos_api_session):
 @pytest.mark.parametrize(
     'container,vip_net,proxy_net',
     generate_vip_app_permutations())
+@common.xfailflake(
+    reason=(
+        "DCOS-46220 Constraints for run spec [xxx] not satisfied / "
+        "DCOS-45799 - container stuck in PROVISIONING"
+    ),
+)
 def test_vip(dcos_api_session,
              container: marathon.Container,
              vip_net: marathon.Network,