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

Properly set ACMEURL in e2e tests

Browse Source
This commit is contained in:
James Munnelly 2018-01-13 16:07:59 +00:00
parent d5dd212cab
commit 228e45e2bb
4 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/e2e/certificate/certificate_acme.go
View File

@ -30,8 +30,6 @@ import (
"github.com/jetstack/cert-manager/test/util"
)
var testingACMEURL = framework.TestContext.ACMEURL
const invalidACMEURL = "http://not-a-real-acme-url.com"
const testingACMEEmail = "test@example.com"
const testingACMEPrivateKey = "test-acme-private-key"
@ -47,6 +45,7 @@ func init() {
var _ = framework.CertManagerDescribe("ACME Certificate (HTTP01)", func() {
f := framework.NewDefaultFramework("create-acme-certificate-http01")
testingACMEURL := framework.TestContext.ACMEURL
issuerName := "test-acme-issuer"
certificateName := "test-acme-certificate"
certificateSecretName := "test-acme-certificate"

4
test/e2e/framework/test_context.go
View File

@ -59,8 +59,8 @@ func RegisterCommonFlags() {
flag.StringVar(&TestContext.CertManagerHost, "cert-manager-host", "http://127.0.0.1:30000", "The cert-manager host, or apiserver, to connect to")
flag.StringVar(&TestContext.CertManagerConfig, "cert-manager-config", os.Getenv(RecommendedConfigPathEnvVar), "Path to config containing embedded authinfo for cert-manager. Default value is from environment variable "+RecommendedConfigPathEnvVar)
flag.StringVar(&TestContext.CertManagerContext, "cert-manager-context", "", "config context to use for cert-manager. If unset, will use value from 'current-context'")
flag.StringVar(&TestContext.BoulderImageRepo, "boulder-image-repo", "quay.io/munnerz/boulder", "The container image repository for boulder to use in e2e tests")
flag.StringVar(&TestContext.BoulderImageTag, "boulder-image-tag", "20180113", "The container image tag for boulder to use in e2e tests")
flag.StringVar(&TestContext.BoulderImageRepo, "boulder-image-repo", "", "The container image repository for boulder to use in e2e tests")
flag.StringVar(&TestContext.BoulderImageTag, "boulder-image-tag", "", "The container image tag for boulder to use in e2e tests")
flag.StringVar(&TestContext.ACMEURL, "acme-url", "http://boulder.boulder.svc.cluster.local:4000/directory", "The ACME test server to use in e2e tests")
}

3
test/e2e/ingress/certificate_acme.go
View File

@ -27,8 +27,6 @@ import (
"github.com/jetstack/cert-manager/test/util"
)
var testingACMEURL = framework.TestContext.ACMEURL
const testingACMEEmail = "test@example.com"
const testingACMEPrivateKey = "test-acme-private-key"
const foreverTestTimeout = time.Second * 60
@ -36,6 +34,7 @@ const foreverTestTimeout = time.Second * 60
var _ = framework.CertManagerDescribe("ACME Certificate with Ingress (HTTP01)", func() {
f := framework.NewDefaultFramework("create-acme-certificate-http01-ingress")
testingACMEURL := framework.TestContext.ACMEURL
issuerName := "test-acme-issuer"
certificateSecretName := "test-acme-certificate"

11
test/e2e/issuer/issuer_acme.go
View File

@ -27,9 +27,14 @@ import (
"github.com/jetstack/cert-manager/test/util"
)
const invalidACMEURL = "http://not-a-real-acme-url.com"
const testingACMEEmail = "test@example.com"
const testingACMEPrivateKey = "test-acme-private-key"
var _ = framework.CertManagerDescribe("ACME Issuer", func() {
f := framework.NewDefaultFramework("create-acme-issuer")
testingACMEURL := framework.TestContext.ACMEURL
issuerName := "test-acme-issuer"
BeforeEach(func() {
@ -161,9 +166,3 @@ var _ = framework.CertManagerDescribe("ACME Issuer", func() {
Expect(err).NotTo(HaveOccurred())
})
})
var testingACMEURL = framework.TestContext.ACMEURL
const invalidACMEURL = "http://not-a-real-acme-url.com"
const testingACMEEmail = "test@example.com"
const testingACMEPrivateKey = "test-acme-private-key"