https://github.com/cilium/cilium
Revision 9d4e99d500d0371bc5f42125d6c6772c387a7721 authored by Quentin Monnet on 23 June 2021, 14:25:47 UTC, committed by André Martins on 28 June 2021, 23:12:58 UTC
The AfterAll() and AfterEach() blocks in the test file for custom calls
run everytime, even if the Context block for the actual tests is
skipped. In that case, running the final blocks results in an attempt to
remove deployments that have never been set up in the first place. This
may lead to the blocks failing when the tests were in fact skipped, and
may produce test artifacts even though Jenkins does not considered the
test failed.
Let's reorganise those blocks, to make sure they are called only when
necessary. Note that we do need to keep both DeleteCilium() and
DeleteAll(), even if they are now in the same block, as calling only
DeleteAll() would not remove the Cilium ConfigMap.
Fixes: 37f6192c9e77 ("test: add CI test for tail calls hooks for custom programs")
Fixes: #13191
Fixes: #16633
Reported-by: Paul Chaignon <paul@cilium.io>
Signed-off-by: Quentin Monnet <quentin@isovalent.com>
1 parent d1a3b70
Tip revision: 9d4e99d500d0371bc5f42125d6c6772c387a7721 authored by Quentin Monnet on 23 June 2021, 14:25:47 UTC
tests: rework custom calls's AfterEach/AfterAll blocks to skip if needed
tests: rework custom calls's AfterEach/AfterAll blocks to skip if needed
Tip revision: 9d4e99d
go.mod
module github.com/cilium/cilium
go 1.16
// direct dependencies
require (
github.com/Azure/azure-sdk-for-go v54.0.0+incompatible
github.com/Azure/go-autorest/autorest v0.11.17
github.com/Azure/go-autorest/autorest/adal v0.9.13
github.com/Azure/go-autorest/autorest/azure/auth v0.5.7
github.com/Azure/go-autorest/autorest/to v0.4.0
github.com/Azure/go-autorest/autorest/validation v0.2.0 // indirect
github.com/aliyun/alibaba-cloud-sdk-go v1.61.1153
github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef
github.com/aws/aws-sdk-go-v2 v1.6.0
github.com/aws/aws-sdk-go-v2/config v1.2.0
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.1.1
github.com/aws/aws-sdk-go-v2/internal/ini v1.0.0 // indirect
github.com/aws/aws-sdk-go-v2/service/ec2 v1.5.0
github.com/aws/smithy-go v1.4.0
github.com/blang/semver/v4 v4.0.0
github.com/cilium/customvet v0.0.0-20201209211516-9852765c1ac4
github.com/cilium/deepequal-gen v0.0.0-20200406125435-ad6a9003139e
github.com/cilium/ebpf v0.5.1-0.20210421150058-a4ee356536f3
github.com/cilium/ipam v0.0.0-20201106170308-4184bc4bf9d6
github.com/cilium/proxy v0.0.0-20210511221533-82a70d56bf32
github.com/cncf/udpa/go v0.0.0-20201211205326-cc1b757b3edd // indirect
github.com/containernetworking/cni v0.8.1
github.com/containernetworking/plugins v0.9.0
github.com/davecgh/go-spew v1.1.1
github.com/docker/distribution v2.7.1+incompatible // indirect
github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/libnetwork v0.0.0-20190128195551-d8d4c8cf03d7
github.com/fsnotify/fsnotify v1.4.10-0.20200417215612-7f4cf4dd2b52
github.com/go-openapi/errors v0.19.9
github.com/go-openapi/loads v0.20.2
github.com/go-openapi/runtime v0.19.28
github.com/go-openapi/spec v0.20.3
github.com/go-openapi/strfmt v0.20.0
github.com/go-openapi/swag v0.19.15
github.com/go-openapi/validate v0.20.1
github.com/gogo/protobuf v1.3.2
github.com/golang/protobuf v1.4.3
github.com/google/go-cmp v0.5.6
github.com/google/gopacket v1.1.19
github.com/google/gops v0.3.18
github.com/google/renameio v1.0.0
github.com/google/uuid v1.2.0
github.com/gorilla/mux v1.8.0
github.com/hashicorp/consul/api v1.3.0
github.com/hashicorp/go-immutable-radix v1.3.0
github.com/hashicorp/golang-lru v0.5.4
// must be bound to this old version not to break libnetwork
github.com/ishidawataru/sctp v0.0.0-20180213033435-07191f837fed // indirect
github.com/jeremywohl/flatten v1.0.1
github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351
github.com/kr/pretty v0.2.1
github.com/mattn/go-shellwords v1.0.10
github.com/miekg/dns v1.1.26
github.com/morikuni/aec v1.0.0 // indirect
github.com/onsi/ginkgo v1.12.1
github.com/onsi/gomega v1.10.5
github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
github.com/opencontainers/image-spec v1.0.1 // indirect
github.com/optiopay/kafka v0.0.0-20171218140449-a1e0071f1ce8
github.com/pmezard/go-difflib v1.0.0
github.com/prometheus/client_golang v1.9.0
github.com/prometheus/client_model v0.2.1-0.20200623203004-60555c9708c7
github.com/russross/blackfriday/v2 v2.1.0
github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa
github.com/servak/go-fastping v0.0.0-20160802140958-5718d12e20a0
github.com/shirou/gopsutil/v3 v3.21.5
github.com/sirupsen/logrus v1.7.0
github.com/spf13/cobra v1.1.1
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.7.1
github.com/stretchr/testify v1.7.0
github.com/vishvananda/netlink v1.1.1-0.20210510164352-d17758a128bf
github.com/vishvananda/netns v0.0.0-20201230012202-c4f3ca719c73
go.etcd.io/etcd v0.5.0-alpha.5.0.20201125193152-8a03d2e9614b
go.uber.org/goleak v1.1.10
go.universe.tf/metallb v0.9.6
golang.org/x/crypto v0.0.0-20210503195802-e9a32991a82e
golang.org/x/net v0.0.0-20210504132125-bbd867fde50d
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
golang.org/x/sys v0.0.0-20210503173754-0981d6026fa6
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
golang.org/x/tools v0.1.0
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20210506160403-92e472f520a5
google.golang.org/genproto v0.0.0-20210126160654-44e461bb6506
google.golang.org/grpc v1.29.1
google.golang.org/protobuf v1.25.0
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
gopkg.in/ini.v1 v1.62.0
gopkg.in/natefinch/lumberjack.v2 v2.0.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.21.1
k8s.io/apiextensions-apiserver v0.21.1
k8s.io/apimachinery v0.21.1
k8s.io/client-go v0.21.1
k8s.io/code-generator v0.21.1
k8s.io/klog/v2 v2.8.0
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7
// We specify the controller-tools version here to be the version of the
// fork below, so that when we generate CRDs, the generated CRD contains
// version number of the tool. We want the version number to match up with
// the fork, even though this specific version doesn't exist in upstream
// controller-tools.
sigs.k8s.io/controller-tools v0.3.1-0.20200716001835-4a903ddb7005
sigs.k8s.io/yaml v1.2.0
)
replace (
github.com/miekg/dns => github.com/cilium/dns v1.1.4-0.20190417235132-8e25ec9a0ff3
github.com/optiopay/kafka => github.com/cilium/kafka v0.0.0-20180809090225-01ce283b732b
go.universe.tf/metallb => github.com/cilium/metallb v0.1.1-0.20210607221240-b4c60b959dd7
// Using private fork of controller-tools. See commit msg for more context
// as to why we are using a private fork.
sigs.k8s.io/controller-tools => github.com/christarazi/controller-tools v0.3.1-0.20200911184030-7e668c1fb4c2
)
Computing file changes ...
