From cd94b3ef74b96802da5ec93841239b90825ad97a Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Tue, 11 Jun 2019 21:33:32 +0200 Subject: [PATCH] CI: test_upstream_compat: disable binutils check We need to freeze binutils at 2.31 (Alpine has 2.32 already), until issue #295 is resolved. Let's disable the test, so the testsuite passes again if everything else is good, and we don't start to ignore whether it fails or not. --- .gitlab-ci/testcases/test_upstream_compatibility.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/testcases/test_upstream_compatibility.py b/.gitlab-ci/testcases/test_upstream_compatibility.py index 5b8c69a16..98ccc4807 100644 --- a/.gitlab-ci/testcases/test_upstream_compatibility.py +++ b/.gitlab-ci/testcases/test_upstream_compatibility.py @@ -78,8 +78,8 @@ def test_aportgen_versions(args): index = pmb.helpers.repo.alpine_apkindex_path(args, "main", "x86_64") # Alpine packages and patterns for our derivatives - map = {"binutils": "binutils-*", - "busybox": "busybox-static-*", + # binutils: frozen at 2.31 for now, until #295 is resolved! + map = {"busybox": "busybox-static-*", "gcc": "gcc-*", "grub": "grub-efi-*", "musl": "musl-*"}