From 55f1e58a7a3e77027dd23cf58564424d76ab6dc0 Mon Sep 17 00:00:00 2001 From: philwo Date: Thu, 4 Jan 2018 15:54:11 -0800 Subject: Remove FreeBSD from our CI temporarily. RELNOTES: None. PiperOrigin-RevId: 180857355 --- scripts/ci/bazel-slow-tests.json | 2 -- scripts/ci/bazel-tests.json | 26 -------------------------- scripts/ci/bootstrap.json | 34 ---------------------------------- 3 files changed, 62 deletions(-) diff --git a/scripts/ci/bazel-slow-tests.json b/scripts/ci/bazel-slow-tests.json index 43f6a469a1..b603a6c8a4 100644 --- a/scripts/ci/bazel-slow-tests.json +++ b/scripts/ci/bazel-slow-tests.json @@ -25,8 +25,6 @@ {"node": "linux-x86_64"}, {"node": "ubuntu_16.04-x86_64"}, {"node": "darwin-x86_64"} - // TODO(aehlig): {"node": "freebsd-11"}, - // TODO(aehlig): {"node": "freebsd-12"}, // TODO(pcloudy): {"node": "windows-x86_64"}, ], "parameters": { diff --git a/scripts/ci/bazel-tests.json b/scripts/ci/bazel-tests.json index 62af16f2da..796d059180 100644 --- a/scripts/ci/bazel-tests.json +++ b/scripts/ci/bazel-tests.json @@ -29,32 +29,6 @@ "test_tag_filters": ["-slow"], "targets": [] } - }, { - "configurations": [ - {"node": "freebsd-11"} //, - // TODO(aehlig): Fix bazelbuild/continuous-integration#149 and reactivate. - // {"node": "freebsd-12"} - ], - "parameters": { - // As configure step, we redo the USES=shebangfix of the devel/bazel - // port. In other words, we replace every #!-line calling bash by a - // line containing the correct path to bash on our test machines. - "configure": [ - "find -E . -type f -iregex '.*(sh|txt|_stub|stub_.*|bazel|get_workspace_status|protobuf_support|_so)' \\", - "-exec sed -i '' \\", - "-e '1s|^\\#![[:space:]]*/bin/bash\\([[:space:]]\\)|\\#!/usr/local/bin/bash\\1|' \\", - "-e '1s|^\\#![[:space:]]*/bin/bash$|\\#!/usr/local/bin/bash|' \\", - "-e '1s|^\\#![[:space:]]*/usr/bin/env bash\\([[:space:]]\\)|\\#!/usr/local/bin/bash\\1|' \\", - "-e '1s|^\\#![[:space:]]*/usr/bin/env bash$|\\#!/usr/local/bin/bash|' \\", - "{} +" - ], - "tests": [ - "//src/test/shell/integration/...", - "let bazel=\"//src/test/shell/bazel/...\" in $bazel - filter(\"all_tests\", $bazel) - filter(\"jdk\", $bazel) - filter(\"maven\", $bazel) - filter(\"android\", $bazel) - filter(\"java\", $bazel) - filter(\"workspace\", $bazel) - filter(\"external\", $bazel) - filter(\"example\", $bazel) - filter(\"skylark_repository\", $bazel) - filter(\"repository_cache\", $bazel)" - ], - "test_tag_filters": ["-slow"], - "targets": [] - } }, { "node": "darwin-x86_64", "parameters": { diff --git a/scripts/ci/bootstrap.json b/scripts/ci/bootstrap.json index bdaa497367..9d4244a171 100644 --- a/scripts/ci/bootstrap.json +++ b/scripts/ci/bootstrap.json @@ -25,40 +25,6 @@ "opts": ["-c opt"] }, { "node": "ubuntu_16.04-x86_64", "variation": "" }, - { - "variation": "", - "node": "freebsd-11", - "parameters": { - "configure": [ - "find -E . -type f -iregex '.*(sh|txt|_stub|stub_.*|bazel|get_workspace_status|protobuf_support|_so)' \\", - "-exec sed -i '' \\", - "-e '1s|^\\#![[:space:]]*/bin/bash\\([[:space:]]\\)|\\#!/usr/local/bin/bash\\1|' \\", - "-e '1s|^\\#![[:space:]]*/bin/bash$|\\#!/usr/local/bin/bash|' \\", - "-e '1s|^\\#![[:space:]]*/usr/bin/env bash\\([[:space:]]\\)|\\#!/usr/local/bin/bash\\1|' \\", - "-e '1s|^\\#![[:space:]]*/usr/bin/env bash$|\\#!/usr/local/bin/bash|' \\", - "{} +" - ], - "archive": {"bazel-bin/src/bazel": "bazel"} - }, - "opts": ["-c opt"] - }, - { - "variation": "", - "node": "freebsd-12", - "parameters": { - "configure": [ - "find -E . -type f -iregex '.*(sh|txt|_stub|stub_.*|bazel|get_workspace_status|protobuf_support|_so)' \\", - "-exec sed -i '' \\", - "-e '1s|^\\#![[:space:]]*/bin/bash\\([[:space:]]\\)|\\#!/usr/local/bin/bash\\1|' \\", - "-e '1s|^\\#![[:space:]]*/bin/bash$|\\#!/usr/local/bin/bash|' \\", - "-e '1s|^\\#![[:space:]]*/usr/bin/env bash\\([[:space:]]\\)|\\#!/usr/local/bin/bash\\1|' \\", - "-e '1s|^\\#![[:space:]]*/usr/bin/env bash$|\\#!/usr/local/bin/bash|' \\", - "{} +" - ], - "archive": {"bazel-bin/src/bazel": "bazel"} - }, - "opts": ["-c opt"] - }, { "variation": "", "node": "darwin-x86_64", -- cgit v1.2.3