Browse Source

Merge pull request #42498 from thaJeztah/libnetwork_cleanup

libnetwork: remove some things that are no longer needed
Sebastiaan van Stijn 4 years ago
parent
commit
594fdec993

+ 0 - 79
libnetwork/.circleci/config.yml

@@ -1,79 +0,0 @@
-version: 2
-
-defaults: &defaults
-  working_directory: ~/go/src/github.com/docker/libnetwork
-  docker:
-    # the following image is irrelevant for the build, everything is built inside a container, check the Makefile
-    - image: 'circleci/golang:latest'
-      environment:
-          dockerbuildargs: .
-          dockerargs:  --privileged -e CIRCLECI
-
-jobs:
-  builder:
-    <<: *defaults
-    steps:
-      - checkout
-      - setup_remote_docker:
-          version: 19.03.12
-          reusable: true
-          exclusive: false
-      - run: make builder
-
-  build:
-    <<: *defaults
-    steps:
-      - checkout
-      - setup_remote_docker:
-          version: 19.03.12
-          reusable: true
-          exclusive: false
-      - run: make build
-
-  check:
-    <<: *defaults
-    steps:
-      - checkout
-      - setup_remote_docker:
-          version: 19.03.12
-          reusable: true
-          exclusive: false
-      - run: make check
-
-  cross:
-    <<: *defaults
-    steps:
-      - checkout
-      - setup_remote_docker:
-          version: 19.03.12
-          reusable: true
-          exclusive: false
-      - run: make cross
-
-  unit-tests:
-    <<: *defaults
-    steps:
-      - checkout
-      - setup_remote_docker:
-          version: 19.03.12
-          reusable: true
-          exclusive: false
-      - run: make unit-tests
-
-workflows:
-  version: 2
-  ci:
-    jobs:
-      - builder
-      - build:
-          requires:
-            - builder
-      - check:
-          requires:
-            - builder
-      - cross:
-          requires:
-            - builder
-      - unit-tests:
-          requires:
-            - builder

+ 6 - 2
libnetwork/Dockerfile

@@ -1,6 +1,10 @@
-ARG GO_VERSION=1.13.8
+# syntax=docker/dockerfile:1.2
 
-FROM golang:${GO_VERSION}-buster as dev
+ARG GO_VERSION=1.13.15
+ARG BASE_DEBIAN_DISTRO="buster"
+ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}"
+
+FROM ${GOLANG_IMAGE} AS dev
 RUN apt-get update && apt-get -y install iptables \
 		protobuf-compiler
 

+ 0 - 202
libnetwork/LICENSE

@@ -1,202 +0,0 @@
-Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-

+ 0 - 52
libnetwork/MAINTAINERS

@@ -1,52 +0,0 @@
-# Libnetwork maintainers file
-#
-# This file describes who runs the docker/libnetwork project and how.
-# This is a living document - if you see something out of date or missing, speak up!
-#
-# It is structured to be consumable by both humans and programs.
-# To extract its contents programmatically, use any TOML-compliant parser.
-#
-# This file is compiled into the MAINTAINERS file in docker/opensource.
-#
-[Org]
-	[Org."Core maintainers"]
-		people = [
-			"arkodg",
-			"euanh",
-			"fcrisciani",
-			"mavenugo",
-			"selansen",
-		]
-
-[people]
-
-# A reference list of all people associated with the project.
-# All other sections should refer to people by their canonical key
-# in the people section.
-
-	# ADD YOURSELF HERE IN ALPHABETICAL ORDER
-
-	[people.arkodg]
-	Name = "Arko Dasgupta"
-	Email = "arko.dasgupta@docker.com"
-	GitHub = "arkodg"
-
-	[people.euanh]
-	Name = "Euan Harris"
-	Email = "euan.harris@docker.com"
-	GitHub = "euanh"
-
-	[people.fcrisciani]
-	Name = "Flavio Crisciani"
-	Email = "flavio.crisciani@docker.com"
-	GitHub = "fcrisciani"
-
-	[people.mavenugo]
-	Name = "Madhu Venugopal"
-	Email = "madhu@docker.com"
-	GitHub = "mavenugo"
-
-	[people.selansen]
-	Name = "Elangovan Sivanandam"
-	Email = "elango.siva@docker.com"
-	GitHub = "selansen"

+ 6 - 6
libnetwork/README.md

@@ -1,7 +1,5 @@
 # libnetwork - networking for containers
 
-[![Circle CI](https://circleci.com/gh/docker/libnetwork/tree/master.svg?style=svg)](https://circleci.com/gh/docker/libnetwork/tree/master) [![Coverage Status](https://coveralls.io/repos/docker/libnetwork/badge.svg)](https://coveralls.io/r/docker/libnetwork) [![GoDoc](https://godoc.org/github.com/docker/libnetwork?status.svg)](https://godoc.org/github.com/docker/libnetwork) [![Go Report Card](https://goreportcard.com/badge/github.com/docker/libnetwork)](https://goreportcard.com/report/github.com/docker/libnetwork)
-
 Libnetwork provides a native Go implementation for connecting containers
 
 The goal of libnetwork is to deliver a robust Container Network Model that provides a consistent programming interface and the required network abstractions for applications.
@@ -15,15 +13,17 @@ There are many networking solutions available to suit a broad range of use-cases
 
 
 ```go
+package main
+
 import (
 	"fmt"
 	"log"
 
 	"github.com/docker/docker/pkg/reexec"
-	"github.com/docker/libnetwork"
-	"github.com/docker/libnetwork/config"
-	"github.com/docker/libnetwork/netlabel"
-	"github.com/docker/libnetwork/options"
+	"github.com/docker/docker/libnetwork"
+	"github.com/docker/docker/libnetwork/config"
+	"github.com/docker/docker/libnetwork/netlabel"
+	"github.com/docker/docker/libnetwork/options"
 )
 
 func main() {

+ 0 - 4
libnetwork/osl/sandbox_linux_test.go

@@ -186,10 +186,6 @@ func TestScanStatistics(t *testing.T) {
 }
 
 func TestDisableIPv6DAD(t *testing.T) {
-	if testutils.RunningOnCircleCI() {
-		t.Skipf("Skipping as not supported on CIRCLE CI kernel")
-	}
-
 	defer testutils.SetupTestOSContext(t)()
 
 	key, err := newKey(t)

+ 3 - 3
libnetwork/resolver.go

@@ -21,10 +21,10 @@ type Resolver interface {
 	// Stop stops the name server for the container. Stopped resolver
 	// can be reused after running the SetupFunc again.
 	Stop()
-	// SetupFunc() provides the setup function that should be run
+	// SetupFunc provides the setup function that should be run
 	// in the container's network namespace.
 	SetupFunc(int) func()
-	// NameServer() returns the IP of the DNS resolver for the
+	// NameServer returns the IP of the DNS resolver for the
 	// containers.
 	NameServer() string
 	// SetExtServers configures the external nameservers the resolver
@@ -52,7 +52,7 @@ type DNSBackend interface {
 	// ExecFunc allows a function to be executed in the context of the backend
 	// on behalf of the resolver.
 	ExecFunc(f func()) error
-	//NdotsSet queries the backends ndots dns option settings
+	// NdotsSet queries the backends ndots dns option settings
 	NdotsSet() bool
 	// HandleQueryResp passes the name & IP from a response to the backend. backend
 	// can use it to maintain any required state about the resolution

+ 0 - 18
libnetwork/test/integration/dnet/bridge.bats

@@ -47,16 +47,12 @@ function test_single_network_connectivity() {
 }
 
 @test "Test default bridge network" {
-    skip_for_circleci
-
     echo $(docker ps)
     test_single_network_connectivity bridge 3
 }
 
 
 @test "Test default network dnet restart" {
-    skip_for_circleci
-
     echo $(docker ps)
 
     for iter in `seq 1 2`;
@@ -70,8 +66,6 @@ function test_single_network_connectivity() {
 }
 
 @test "Test default network dnet ungraceful restart" {
-    skip_for_circleci
-
     echo $(docker ps)
 
     for iter in `seq 1 2`;
@@ -87,8 +81,6 @@ function test_single_network_connectivity() {
 }
 
 @test "Test bridge network" {
-    skip_for_circleci
-
     echo $(docker ps)
     dnet_cmd $(inst_id2port 1) network create -d bridge singlehost
     test_single_network_connectivity singlehost 3
@@ -96,8 +88,6 @@ function test_single_network_connectivity() {
 }
 
 @test "Test bridge network dnet restart" {
-    skip_for_circleci
-
     echo $(docker ps)
     dnet_cmd $(inst_id2port 1) network create -d bridge singlehost
 
@@ -114,8 +104,6 @@ function test_single_network_connectivity() {
 }
 
 @test "Test bridge network dnet ungraceful restart" {
-    skip_for_circleci
-
     echo $(docker ps)
     dnet_cmd $(inst_id2port 1) network create -d bridge singlehost
 
@@ -134,8 +122,6 @@ function test_single_network_connectivity() {
 }
 
 @test "Test multiple bridge networks" {
-    skip_for_circleci
-
     echo $(docker ps)
 
     start=1
@@ -237,7 +223,6 @@ function test_single_network_connectivity() {
 }
 
 @test "Test bridge network alias support" {
-    skip_for_circleci
     dnet_cmd $(inst_id2port 1) network create -d bridge br1
     dnet_cmd $(inst_id2port 1) container create container_1
     net_connect 1 container_1 br1 container_2:c2 
@@ -254,7 +239,6 @@ function test_single_network_connectivity() {
 
 
 @test "Test bridge network global alias support" {
-    skip_for_circleci
     dnet_cmd $(inst_id2port 1) network create -d bridge br1
     dnet_cmd $(inst_id2port 1) network create -d bridge br2
     dnet_cmd $(inst_id2port 1) container create container_1
@@ -284,8 +268,6 @@ function test_single_network_connectivity() {
 }
 
 @test "Test bridge network internal network" {
-    skip_for_circleci
-
     echo $(docker ps)
     dnet_cmd $(inst_id2port 1) network create -d bridge --internal internal
     dnet_cmd $(inst_id2port 1) container create container_1

+ 4 - 26
libnetwork/test/integration/dnet/helpers.bash

@@ -54,11 +54,7 @@ function start_consul() {
 
 function stop_consul() {
     echo "consul started"
-    docker stop pr_consul || true
-    # You cannot destroy a container in Circle CI. So do not attempt destroy in circleci
-    if [ -z "$CIRCLECI" ]; then
-	docker rm -f pr_consul || true
-    fi
+    docker rm -f pr_consul || true
 }
 
 hrun() {
@@ -228,22 +224,12 @@ function start_ovrouter() {
 	   mrjana/golang ./cmd/ovrouter/ovrouter eth0
 }
 
-function skip_for_circleci() {
-    if [ -n "$CIRCLECI" ]; then
-	skip
-    fi
-}
-
 function stop_dnet() {
     local name
 
     name=$(dnet_container_name $1 $2)
     rm -rf /tmp/dnet/${name} || true
-    docker stop ${name} || true
-    # You cannot destroy a container in Circle CI. So do not attempt destroy in circleci
-    if [ -z "$CIRCLECI" ]; then
-	docker rm -f ${name} || true
-    fi
+    docker rm -f ${name} || true
 }
 
 function dnet_cmd() {
@@ -299,11 +285,7 @@ function start_etcd() {
 }
 
 function stop_etcd() {
-    docker stop dn_etcd || true
-    # You cannot destroy a container in Circle CI. So do not attempt destroy in circleci
-    if [ -z "$CIRCLECI" ]; then
-	docker rm -f dn_etcd || true
-    fi
+    docker rm -f dn_etcd || true
 }
 
 function start_zookeeper() {
@@ -318,11 +300,7 @@ function start_zookeeper() {
 
 function stop_zookeeper() {
     echo "zookeeper started"
-    docker stop zookeeper_server || true
-    # You cannot destroy a container in Circle CI. So do not attempt destroy in circleci
-    if [ -z "$CIRCLECI" ]; then
-	docker rm -f zookeeper_server || true
-    fi
+    docker rm -f zookeeper_server || true
 }
 
 function test_overlay() {

+ 0 - 1
libnetwork/test/integration/dnet/overlay-consul-host.bats

@@ -4,6 +4,5 @@
 load helpers
 
 @test "Test overlay network hostmode with consul" {
-    skip_for_circleci
     test_overlay_hostmode consul
 }

+ 0 - 5
libnetwork/test/integration/dnet/overlay-consul.bats

@@ -4,17 +4,14 @@
 load helpers
 
 @test "Test overlay network with consul" {
-    skip_for_circleci
     test_overlay consul
 }
 
 @test "Test overlay network singlehost with consul" {
-    skip_for_circleci
     test_overlay_singlehost consul
 }
 
 @test "Test overlay network with dnet restart" {
-    skip_for_circleci
     test_overlay consul skip_rm
     docker restart dnet-1-consul
     wait_for_dnet $(inst_id2port 1) dnet-1-consul
@@ -26,12 +23,10 @@ load helpers
 }
 
 @test "Test overlay network internal network with consul" {
-    skip_for_circleci
     test_overlay consul internal
 }
 
 @test "Test overlay network with dnet ungraceful shutdown" {
-    skip_for_circleci
     dnet_cmd $(inst_id2port 1) network create -d overlay multihost
     start=1
     end=3

+ 0 - 1
libnetwork/test/integration/dnet/overlay-etcd.bats

@@ -4,6 +4,5 @@
 load helpers
 
 @test "Test overlay network with etcd" {
-    skip_for_circleci
     test_overlay etcd
 }

+ 0 - 1
libnetwork/test/integration/dnet/overlay-local.bats

@@ -51,7 +51,6 @@ function test_overlay_local() {
 }
 
 @test "Test overlay network in local scope" {
-    skip_for_circleci
     test_overlay_local local
 }
 

+ 0 - 1
libnetwork/test/integration/dnet/overlay-zookeeper.bats

@@ -4,6 +4,5 @@
 load helpers
 
 @test "Test overlay network with zookeeper" {
-    skip_for_circleci
     test_overlay zookeeper
 }

+ 2 - 11
libnetwork/test/integration/dnet/run-integration-tests.sh

@@ -11,10 +11,7 @@ trap "cleanup_containers" EXIT SIGINT
 
 function cleanup_containers() {
 	for c in "${!cmap[@]}"; do
-		docker stop $c 1>> ${INTEGRATION_ROOT}/test.log 2>&1 || true
-		if [ -z "$CIRCLECI" ]; then
-			docker rm -f $c 1>> ${INTEGRATION_ROOT}/test.log 2>&1 || true
-		fi
+		docker rm -f $c 1>> ${INTEGRATION_ROOT}/test.log 2>&1 || true
 	done
 
 	unset cmap
@@ -223,13 +220,7 @@ fi
 # Suite setup
 
 if [ -z "$SUITES" ]; then
-	if [ -n "$CIRCLECI" ]; then
-		# We can only run a limited list of suites in circleci because of the
-		# old kernel and limited docker environment.
-		suites="dnet multi_consul multi_zk multi_etcd"
-	else
-		suites="dnet multi_consul multi_zk multi_etcd  bridge overlay_consul overlay_consul_host overlay_zk overlay_etcd"
-	fi
+	suites="dnet multi_consul multi_zk multi_etcd  bridge overlay_consul overlay_consul_host overlay_zk overlay_etcd"
 else
 	suites="$SUITES"
 fi

+ 0 - 6
libnetwork/testutils/context_unix.go

@@ -3,7 +3,6 @@
 package testutils
 
 import (
-	"os"
 	"runtime"
 	"syscall"
 	"testing"
@@ -42,8 +41,3 @@ func SetupTestOSContext(t *testing.T) func() {
 		runtime.UnlockOSThread()
 	}
 }
-
-// RunningOnCircleCI returns true if being executed on libnetwork Circle CI setup
-func RunningOnCircleCI() bool {
-	return os.Getenv("CIRCLECI") != ""
-}

+ 2 - 11
libnetwork/testutils/context_windows.go

@@ -1,9 +1,6 @@
 package testutils
 
-import (
-	"os"
-	"testing"
-)
+import "testing"
 
 // SetupTestOSContext joins a new network namespace, and returns its associated
 // teardown function.
@@ -13,11 +10,5 @@ import (
 //     defer SetupTestOSContext(t)()
 //
 func SetupTestOSContext(t *testing.T) func() {
-	return func() {
-	}
-}
-
-// RunningOnCircleCI returns true if being executed on libnetwork Circle CI setup
-func RunningOnCircleCI() bool {
-	return os.Getenv("CIRCLECI") != ""
+	return func() {}
 }