From 609864a66ddc6af559fadadd76a266d64ae9991e Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Mon, 21 Jun 2021 14:06:45 +0100 Subject: Annotate framework tests with where they are expected to skip Remove hard-coded framework test skip logic in skippable(), instead annotate test.json with environments in which skip is expected. (Mainly this is done with by testing the value of MESON_CI_JOBNAME now set for linux jobs) --- ci/ciimage/bionic/image.json | 1 - ci/ciimage/fedora/image.json | 1 - ci/ciimage/opensuse/image.json | 1 - 3 files changed, 3 deletions(-) (limited to 'ci/ciimage') diff --git a/ci/ciimage/bionic/image.json b/ci/ciimage/bionic/image.json index 6a3d723..d400902 100644 --- a/ci/ciimage/bionic/image.json +++ b/ci/ciimage/bionic/image.json @@ -2,7 +2,6 @@ "base_image": "ubuntu:bionic", "env": { "CI": "1", - "SKIP_SCIENTIFIC": "1", "DC": "gdc" } } diff --git a/ci/ciimage/fedora/image.json b/ci/ciimage/fedora/image.json index ae9ff4f..ee96980 100644 --- a/ci/ciimage/fedora/image.json +++ b/ci/ciimage/fedora/image.json @@ -2,7 +2,6 @@ "base_image": "fedora:latest", "env": { "CI": "1", - "SKIP_SCIENTIFIC": "1", "SKIP_STATIC_BOOST": "1" } } diff --git a/ci/ciimage/opensuse/image.json b/ci/ciimage/opensuse/image.json index 74acbe5..a5e6d1a 100644 --- a/ci/ciimage/opensuse/image.json +++ b/ci/ciimage/opensuse/image.json @@ -2,7 +2,6 @@ "base_image": "opensuse/tumbleweed:latest", "env": { "CI": "1", - "SKIP_SCIENTIFIC": "1", "SKIP_STATIC_BOOST": "1", "SINGLE_DUB_COMPILER": "1" } -- cgit v1.1