weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Ginkgo skip/focus values can be optionally passed in from CI

Browse Source 
Signed-off-by: irbekrm <irbekrm@gmail.com>

Re-instate Venafi Cloud tests

They are now passing - we can see that for CertificateSigningRequest tests

Signed-off-by: irbekrm <irbekrm@gmail.com>

Don't skip Ginkgo tests marked as feature

We can instead define which tests to skip using GINKGO_FOCUS/GINKGO_SKIP to make skipping/focusing more obvious

Signed-off-by: irbekrm <irbekrm@gmail.com>
This commit is contained in:
irbekrm 2021-08-26 11:39:04 +01:00
parent 4f61d405a6
commit 66d8b85be8
3 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
devel/run-e2e.sh
View File

@ -26,6 +26,28 @@ SCRIPT_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" > /dev/null && pwd )"
export REPO_ROOT="${SCRIPT_ROOT}/.."
source "${SCRIPT_ROOT}/lib/lib.sh"
GINKGO_SKIP=${GINKGO_SKIP:-}
GINKGO_FOCUS=${GINKGO_FOCUS:-}
# Skip Gateway tests for Kubernetes below v1.19
if [[ "$K8S_VERSION" =~ 1\.16 ]] || [[ "$K8S_VERSION" =~ 1\.17 ]] || [[ "$K8S_VERSION" =~ 1\.18 ]]; then
echo "Kubernetes version ${K8S_VERSION}, skipping Gateway tests..."
if [[ -z "$GINKGO_SKIP" ]]; then
GINKGO_SKIP="Gateway"
else
# duplicates are ok
GINKGO_SKIP="${GINKGO_SKIP}|Gateway"
fi
fi
# GINKGO_FOCUS can be set to a regex matching ginkgo specs to run.
# Example- 'export GINKGO_FOCUS='Gateway' (runs only test cases with 'Gateway' in name).
if [[ -n "$GINKGO_FOCUS" ]]; then GINKGO_FOCUS="--ginkgo.focus=${GINKGO_FOCUS}"; fi
# GINKGO_SKIP can be set to a regex matching ginkgo specs to skip. Example-
# 'export GINKGO_SKIP="Venafi Cloud"' (skips all suites with 'Venafi Cloud' in the name).
if [[ -n "$GINKGO_SKIP" ]]; then GINKGO_SKIP="--ginkgo.skip=${GINKGO_SKIP}"; fi
# Configure PATH to use bazel provided e2e tools
setup_tools
@ -38,19 +60,6 @@ mkdir -p "${REPO_ROOT}/_artifacts"
# Build the e2e test binary
bazel build //test/e2e:e2e.test
# Gateway e2e tests are not supported on k8s <1.19
# K8S_VERSION is exported in lib.sh
echo "Using K8S_VERSION ${K8S_VERSION}"
case "$K8S_VERSION" in
"1.16" | "1.17" | "1.18")
SKIP="Gateway"
echo "skipping Gateway e2e tests as K8S_VERSION is <1.19"
;;
*)
SKIP=""
esac
# Run e2e tests
ginkgo -nodes 10 -flakeAttempts ${FLAKE_ATTEMPTS:-1} \
$(bazel info bazel-genfiles)/test/e2e/e2e.test \
@ -59,5 +68,6 @@ ginkgo -nodes 10 -flakeAttempts ${FLAKE_ATTEMPTS:-1} \
--report-dir="${ARTIFACTS:-$REPO_ROOT/_artifacts}" \
--acme-dns-server="$DNS_SERVER" \
--acme-ingress-ip="$INGRESS_IP" \
"--ginkgo.skip=${SKIP}" \
${GINKGO_SKIP:+"$GINKGO_SKIP"} \
${GINKGO_FOCUS:+"$GINKGO_FOCUS"} \
"$@"

2
test/e2e/e2e_test.go
View File

@ -57,7 +57,7 @@ func TestE2E(t *testing.T) {
// Copied from https://github.com/kubernetes/kubernetes/blob/960e5e78255dd148d4dae49f62e729ea940f4f07/test/e2e/e2e.go#L103-L106
// See https://github.com/kubernetes/community/blob/master/contributors/devel/sig-testing/flaky-tests.md#quarantining-flakes
if len(ginkgoconfig.GinkgoConfig.FocusStrings) == 0 && len(ginkgoconfig.GinkgoConfig.SkipStrings) == 0 {
ginkgoconfig.GinkgoConfig.SkipStrings = []string{`\[Flaky\]|\[Feature:.+\]`}
ginkgoconfig.GinkgoConfig.SkipStrings = []string{`\[Flaky\]`}
}
if err := framework.DefaultConfig.Validate(); err != nil {

2
test/e2e/suite/conformance/certificates/venaficloud/cloud.go
View File

@ -32,7 +32,7 @@ import (
"github.com/jetstack/cert-manager/test/e2e/suite/conformance/certificates"
)
var _ = framework.ConformanceDescribe("[Feature:Issuers:Venafi:Cloud] Certificates", func() {
var _ = framework.ConformanceDescribe("Certificates", func() {
// unsupportedFeatures is a list of features that are not supported by the
// Venafi Cloud issuer.
var unsupportedFeatures = featureset.NewFeatureSet(