diff options
author | philwo <philwo@google.com> | 2018-01-04 15:54:11 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-01-04 15:56:05 -0800 |
commit | 55f1e58a7a3e77027dd23cf58564424d76ab6dc0 (patch) | |
tree | 45bab519df14469cc17cbcbf65038b703f82f8ba /scripts | |
parent | 86b4532769c22cca2ed7068a60f3326beaad34af (diff) |
Remove FreeBSD from our CI temporarily.
RELNOTES: None.
PiperOrigin-RevId: 180857355
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/ci/bazel-slow-tests.json | 2 | ||||
-rw-r--r-- | scripts/ci/bazel-tests.json | 26 | ||||
-rw-r--r-- | scripts/ci/bootstrap.json | 34 |
3 files changed, 0 insertions, 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 @@ -30,32 +30,6 @@ "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": { "configure": [ 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 @@ -27,40 +27,6 @@ { "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", "parameters": { "archive": { |