opensourcemirror
/
concourse
mirror of https://github.com/concourse/concourse.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4443 from concourse/fix-more-topgun-paths 

fix a bunch more topgun file paths
This commit is contained in:
Jamie Klassen 2019-09-17 00:11:36 -04:00 committed by GitHub
parent d21960e18a 4d564f2145
commit b380f5c1ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 61 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
topgun/both/atc_shutdown_test.go
View File

@ -21,7 +21,7 @@ var _ = Describe("ATC Shutting down", func() {
BeforeEach(func() {
Deploy(
"deployments/concourse.yml",
"-o", "operations/web-instances.yml",
"-o", "../operations/web-instances.yml",
"-v", "web_instances=2",
)

4
topgun/both/image_artifact_test.go
View File

@ -12,8 +12,8 @@ var _ = Describe("A job with a task using an image within the plan", func() {
BeforeEach(func() {
Deploy(
"deployments/concourse.yml",
"-o", "operations/add-other-worker.yml",
"-o", "operations/other-worker-tagged.yml",
"-o", "../operations/add-other-worker.yml",
"-o", "../operations/other-worker-tagged.yml",
)
fly.Run("set-pipeline", "-n", "-p", "image-artifact", "-c", "pipelines/image-artifact.yml")

2
topgun/both/image_resource_gc_test.go
View File

@ -12,7 +12,7 @@ import (
var _ = Describe("A build using an image_resource", func() {
BeforeEach(func() {
Deploy("deployments/concourse.yml", "-o", "operations/fast-gc.yml")
Deploy("deployments/concourse.yml", "-o", "../operations/fast-gc.yml")
})
Describe("one-off builds", func() {

8
topgun/both/resource_check_test.go
View File

@ -12,8 +12,8 @@ var _ = Describe("Resource checking", func() {
Context("with a global worker and a tagged", func() {
BeforeEach(func() {
Deploy("deployments/concourse.yml",
"-o", "operations/add-other-worker.yml",
"-o", "operations/tagged-worker.yml")
"-o", "../operations/add-other-worker.yml",
"-o", "../operations/tagged-worker.yml")
})
Describe("tagged resources", func() {
@ -64,8 +64,8 @@ var _ = Describe("Resource checking", func() {
BeforeEach(func() {
Deploy(
"deployments/concourse.yml",
"-o", "operations/add-other-worker.yml",
"-o", "operations/other-worker-team.yml",
"-o", "../operations/add-other-worker.yml",
"-o", "../operations/other-worker-team.yml",
)
Eventually(func() []map[string]string {

4
topgun/both/resource_containers_gc_test.go
View File

@ -16,7 +16,7 @@ var _ = Describe("Garbage collecting resource containers", func() {
BeforeEach(func() {
Deploy(
"deployments/concourse.yml",
"-o", "operations/worker-instances.yml",
"-o", "../operations/worker-instances.yml",
"-v", "worker_instances=2",
)
})
@ -187,7 +187,7 @@ var _ = Describe("Garbage collecting resource containers", func() {
Describe("container for resource checking", func() {
BeforeEach(func() {
Deploy("deployments/concourse.yml", "-o", "operations/fast-gc.yml")
Deploy("deployments/concourse.yml", "-o", "../operations/fast-gc.yml")
})
It("is not immediately removed", func() {

4
topgun/both/resource_types_test.go
View File

@ -9,7 +9,7 @@ import (
var _ = Describe("A pipeline-provided resource type", func() {
BeforeEach(func() {
Deploy("deployments/concourse.yml", "-o", "operations/no-gc.yml")
Deploy("deployments/concourse.yml", "-o", "../operations/no-gc.yml")
})
It("does not result in redundant containers when running resource actions", func() {
@ -44,7 +44,7 @@ var _ = Describe("A pipeline-provided resource type", func() {
var _ = Describe("Tagged resource types", func() {
BeforeEach(func() {
Deploy("deployments/concourse.yml", "-o", "operations/tagged-worker.yml")
Deploy("deployments/concourse.yml", "-o", "../operations/tagged-worker.yml")
By("setting a pipeline with tagged custom types")
fly.Run("set-pipeline", "-n", "-c", "pipelines/tagged-custom-types.yml", "-p", "pipe")

2
topgun/both/resource_volumes_gc_test.go
View File

@ -157,7 +157,7 @@ var _ = Describe("Garbage collecting resource cache volumes", func() {
Describe("resource cache is not reaped when being used by a build", func() {
BeforeEach(func() {
Deploy("deployments/concourse.yml", "-o", "operations/fast-gc.yml")
Deploy("deployments/concourse.yml", "-o", "../operations/fast-gc.yml")
})
It("finds the resource cache volumes throughout duration of build", func() {

6
topgun/both/worker_landing_test.go
View File

@ -51,7 +51,7 @@ var _ = Describe("Worker landing", func() {
BeforeEach(func() {
Deploy(
"deployments/concourse.yml",
"-o", "operations/worker-instances.yml",
"-o", "../operations/worker-instances.yml",
"-v", "worker_instances=2",
)
})
@ -224,7 +224,7 @@ var _ = Describe("Worker landing", func() {
BeforeEach(func() {
Deploy(
"deployments/concourse.yml",
"-o", "operations/worker-instances.yml",
"-o", "../operations/worker-instances.yml",
"-v", "worker_instances=0",
)
@ -232,7 +232,7 @@ var _ = Describe("Worker landing", func() {
Deploy(
"deployments/concourse.yml",
"-o", "operations/worker-team.yml",
"-o", "../operations/worker-team.yml",
)
fly.Run("login", "-c", atcExternalURL, "-n", "team-a", "-u", atcUsername, "-p", atcPassword)

2
topgun/both/worker_retiring_test.go
View File

@ -31,7 +31,7 @@ var _ = Describe("Worker retiring", func() {
Expect(volumesBefore).ToNot(BeEmpty())
By("retiring the worker")
Deploy("deployments/concourse.yml", "-o", "operations/retire-worker.yml")
Deploy("deployments/concourse.yml", "-o", "../operations/retire-worker.yml")
By("getting the worker containers")
containersAfter := FlyTable("containers")

2
topgun/both/worker_stalling_test.go
View File

@ -19,7 +19,7 @@ var _ = Describe("Worker stalling", func() {
BeforeEach(func() {
Deploy(
"deployments/concourse.yml",
"-o", "operations/worker-instances.yml",
"-o", "../operations/worker-instances.yml",
"-v", "worker_instances=2",
)
})

9
topgun/common/common.go
View File

@ -14,11 +14,13 @@ import (
"strings"
"time"
_ "github.com/lib/pq"
gclient "code.cloudfoundry.org/garden/client"
gconn "code.cloudfoundry.org/garden/client/connection"
sq "github.com/Masterminds/squirrel"
"code.cloudfoundry.org/lager"
"code.cloudfoundry.org/lager/lagertest"
sq "github.com/Masterminds/squirrel"
bclient "github.com/concourse/baggageclaim/client"
"golang.org/x/oauth2"
@ -29,7 +31,6 @@ import (
"github.com/onsi/gomega/gexec"
)
var (
deploymentNamePrefix string
@ -168,7 +169,6 @@ type BoshInstance struct {
DNS string
}
func StartDeploy(manifest string, args ...string) *gexec.Session {
WaitForDeploymentLock()
@ -259,7 +259,6 @@ func JobInstances(job string) []BoshInstance {
return jobInstances[job]
}
func LoadJobInstances() (map[string][]BoshInstance, map[string][]BoshInstance) {
session := SpawnBosh("instances", "-p", "--dns")
<-session.Exited
@ -555,7 +554,6 @@ func PgDump() *gexec.Session {
return session
}
var psql = sq.StatementBuilder.PlaceholderFormat(sq.Dollar)
var _ = SynchronizedBeforeSuite(func() []byte {
@ -571,4 +569,3 @@ var _ = SynchronizedAfterSuite(func() {
var InstanceRow = regexp.MustCompile(`^([^/]+)/([^\s]+)\s+-\s+(\w+)\s+z1\s+([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)\s+([^\s]+)\s*$`)
var JobRow = regexp.MustCompile(`^([^\s]+)\s+(\w+)\s+(\w+)\s+-\s+-\s+-\s*$`)

6
topgun/core/atc_login_session_test.go
View File

@ -24,7 +24,7 @@ var _ = Describe("Multiple ATCs Login Session Test", func() {
BeforeEach(func() {
Deploy(
"deployments/concourse.yml",
"-o", "operations/web-instances.yml",
"-o", "../operations/web-instances.yml",
"-v", "web_instances=2",
)
@ -81,9 +81,9 @@ var _ = Describe("Multiple ATCs Login Session Test", func() {
deploy := func() {
Deploy(
"deployments/concourse.yml",
"-o", "operations/web-instances.yml",
"-o", "../operations/web-instances.yml",
"-v", "web_instances=2",
"-o", "operations/external-url.yml",
"-o", "../operations/external-url.yml",
"-v", "external_url="+atc0URL,
)
}

2
topgun/core/aws_ssm_test.go
View File

@ -41,7 +41,7 @@ var _ = Describe("AWS SSM", func() {
}
Deploy(
"deployments/concourse.yml",
"-o", "operations/configure-ssm.yml",
"-o", "../operations/configure-ssm.yml",
"-v", "aws_region="+awsRegion,
"-v", "aws_access_key="+awsCreds.AccessKeyID,
"-v", "aws_secret_key="+awsCreds.SecretAccessKey,

4
topgun/core/credhub_test.go
View File

@ -42,7 +42,7 @@ var _ = Describe("Credhub", func() {
BeforeEach(func() {
Deploy(
"deployments/concourse.yml",
"-o", "operations/add-empty-credhub.yml",
"-o", "../operations/add-empty-credhub.yml",
)
credhubInstance = Instance("credhub")
@ -59,7 +59,7 @@ var _ = Describe("Credhub", func() {
Deploy(
"deployments/concourse.yml",
"-o", "operations/add-credhub.yml",
"-o", "../operations/add-credhub.yml",
"--vars-store", varsStore,
"-v", "credhub_ip="+credhubInstance.IP,
"-v", "postgres_ip="+postgresInstance.IP,

14
topgun/core/database_encryption_test.go
View File

@ -42,7 +42,7 @@ var _ = Describe("Database secrets encryption", func() {
Describe("A deployment with encryption enabled immediately", func() {
BeforeEach(func() {
Deploy("deployments/concourse.yml", "-o", "operations/encryption.yml")
Deploy("deployments/concourse.yml", "-o", "../operations/encryption.yml")
})
It("encrypts pipeline credentials", func() {
@ -74,7 +74,7 @@ var _ = Describe("Database secrets encryption", func() {
Context("when redeployed with encryption enabled", func() {
BeforeEach(func() {
Deploy("deployments/concourse.yml", "-o", "operations/encryption.yml")
Deploy("deployments/concourse.yml", "-o", "../operations/encryption.yml")
})
It("encrypts pipeline credentials", func() {
@ -94,7 +94,7 @@ var _ = Describe("Database secrets encryption", func() {
Context("when the encryption key is rotated", func() {
BeforeEach(func() {
Deploy("deployments/concourse.yml", "-o", "operations/encryption-rotated.yml")
Deploy("deployments/concourse.yml", "-o", "../operations/encryption-rotated.yml")
})
It("can still get and set pipelines", func() {
@ -125,7 +125,7 @@ var _ = Describe("Database secrets encryption", func() {
Context("when an old key is given but all the data is already using the new key", func() {
BeforeEach(func() {
Deploy("deployments/concourse.yml", "-o", "operations/encryption-already-rotated.yml")
Deploy("deployments/concourse.yml", "-o", "../operations/encryption-already-rotated.yml")
})
It("can still get and set pipelines", func() {
@ -161,7 +161,7 @@ var _ = Describe("Database secrets encryption", func() {
BeforeEach(func() {
boshLogs = SpawnBosh("logs", "-f")
deploy = StartDeploy("deployments/concourse.yml", "-o", "operations/encryption-bogus.yml")
deploy = StartDeploy("deployments/concourse.yml", "-o", "../operations/encryption-bogus.yml")
<-deploy.Exited
Expect(deploy.ExitCode()).To(Equal(1))
})
@ -172,7 +172,7 @@ var _ = Describe("Database secrets encryption", func() {
})
AfterEach(func() {
Deploy("deployments/concourse.yml", "-o", "operations/encryption.yml")
Deploy("deployments/concourse.yml", "-o", "../operations/encryption.yml")
})
It("fails to deploy with a useful message", func() {
@ -183,7 +183,7 @@ var _ = Describe("Database secrets encryption", func() {
Context("when the encryption key is removed", func() {
BeforeEach(func() {
Deploy("deployments/concourse.yml", "-o", "operations/encryption-removed.yml")
Deploy("deployments/concourse.yml", "-o", "../operations/encryption-removed.yml")
})
It("decrypts pipeline credentials", func() {

2
topgun/core/syslog_test.go
View File

@ -13,7 +13,7 @@ import (
var _ = Describe("An ATC with syslog draining set", func() {
BeforeEach(func() {
Deploy("deployments/concourse.yml",
"-o", "operations/syslog_configurations.yml",
"-o", "../operations/syslog_configurations.yml",
"-v", "syslog.address=localhost:8081",
"-v", "syslog.hostname=atc1",
"-v", "syslog.transport=tcp",

2
topgun/core/unique_versions_test.go
View File

@ -10,7 +10,7 @@ import (
var _ = Describe("Unique Version History", func() {
BeforeEach(func() {
Deploy("deployments/concourse.yml",
"-o", "operations/enable-global-resources.yml")
"-o", "../operations/enable-global-resources.yml")
_ = WaitForRunningWorker()
})

14
topgun/core/vault_test.go
View File

@ -44,7 +44,7 @@ var _ = Describe("Vault", func() {
Deploy(
"deployments/concourse.yml",
"-o", "operations/add-vault.yml",
"-o", "../operations/add-vault.yml",
"-v", "web_instances=0",
"-v", "vault_url=dontcare",
"-v", "vault_client_token=dontcare",
@ -122,7 +122,7 @@ var _ = Describe("Vault", func() {
By("deploying concourse with the token")
Deploy(
"deployments/concourse.yml",
"-o", "operations/add-vault.yml",
"-o", "../operations/add-vault.yml",
"--vars-store", varsStore.Name(),
"-v", "vault_url="+v.URI(),
"-v", "vault_ip="+v.IP(),
@ -153,9 +153,9 @@ var _ = Describe("Vault", func() {
BeforeEach(func() {
Deploy(
"deployments/concourse.yml",
"-o", "operations/add-vault.yml",
"-o", "../operations/add-vault.yml",
"--vars-store", varsStore.Name(),
"-o", "operations/enable-vault-tls.yml",
"-o", "../operations/enable-vault-tls.yml",
"-v", "vault_url="+v.URI(),
"-v", "vault_ip="+v.IP(),
"-v", "vault_client_token=dontcare",
@ -189,9 +189,9 @@ var _ = Describe("Vault", func() {
Deploy(
"deployments/concourse.yml",
"-o", "operations/add-vault.yml",
"-o", "../operations/add-vault.yml",
"--vars-store", varsStore.Name(),
"-o", "operations/enable-vault-tls.yml",
"-o", "../operations/enable-vault-tls.yml",
"-v", "vault_url="+v.URI(),
"-v", "vault_ip="+v.IP(),
"-v", "web_instances=1",
@ -225,7 +225,7 @@ var _ = Describe("Vault", func() {
Deploy(
"deployments/concourse.yml",
"-o", "operations/add-vault.yml",
"-o", "../operations/add-vault.yml",
"--vars-store", varsStore.Name(),
"-v", "vault_url="+v.URI(),
"-v", "vault_ip="+v.IP(),

8
topgun/pcf/bbr_test.go
View File

@ -49,7 +49,7 @@ var _ = Describe("BBR", func() {
Context("consuming concourse_db links", func() {
BeforeEach(func() {
deployArgs = append(deployArgs, "-o", "operations/bbr-concourse-link.yml")
deployArgs = append(deployArgs, "-o", "../operations/bbr-concourse-link.yml")
})
successfullyExecutesBackup()
@ -57,7 +57,7 @@ var _ = Describe("BBR", func() {
Context("passing properties", func() {
BeforeEach(func() {
deployArgs = append(deployArgs, "-o", "operations/bbr-with-properties.yml")
deployArgs = append(deployArgs, "-o", "../operations/bbr-with-properties.yml")
})
successfullyExecutesBackup()
@ -68,7 +68,7 @@ var _ = Describe("BBR", func() {
Context("regardless of property provider", func() {
BeforeEach(func() {
deployArgs = append(deployArgs, "-o", "operations/bbr-with-properties.yml")
deployArgs = append(deployArgs, "-o", "../operations/bbr-with-properties.yml")
})
JustBeforeEach(func() {
@ -120,7 +120,7 @@ var _ = Describe("BBR", func() {
By("creating a new deployment")
Deploy(
"deployments/concourse.yml",
"-o", "operations/bbr-with-properties.yml",
"-o", "../operations/bbr-with-properties.yml",
)
WaitForRunningWorker()

4
topgun/runtime/atc_rebalance_test.go
View File

@ -22,9 +22,9 @@ var _ = Describe("Rebalancing workers", func() {
BeforeEach(func() {
Deploy(
"deployments/concourse.yml",
"-o", "operations/web-instances.yml",
"-o", "../operations/web-instances.yml",
"-v", "web_instances=2",
"-o", "operations/worker-rebalancing.yml",
"-o", "../operations/worker-rebalancing.yml",
"-v", "rebalance_interval="+rebalanceInterval.String(),
)

4
topgun/runtime/build_artifact_transfer_test.go
View File

@ -11,8 +11,8 @@ var _ = Describe("Passing artifacts between build steps", func() {
BeforeEach(func() {
Deploy(
"deployments/concourse.yml",
"-o", "operations/add-other-worker.yml",
"-o", "operations/distinct-worker-tags.yml",
"-o", "../operations/add-other-worker.yml",
"-o", "../operations/distinct-worker-tags.yml",
)
})

2
topgun/runtime/default_limits_test.go
View File

@ -11,7 +11,7 @@ var _ = Describe("An ATC with default resource limits set", func() {
BeforeEach(func() {
Deploy(
"deployments/concourse.yml",
"-o", "operations/default_limits.yml",
"-o", "../operations/default_limits.yml",
"-v", "default_task_cpu_limit=512",
"-v", "default_task_memory_limit=1GB",
)

4
topgun/runtime/ephemeral_worker_test.go
View File

@ -12,9 +12,9 @@ var _ = Describe("Ephemeral Workers", func() {
BeforeEach(func() {
Deploy(
"deployments/concourse.yml",
"-o", "operations/worker-instances.yml",
"-o", "../operations/worker-instances.yml",
"-v", "worker_instances=2",
"-o", "operations/ephemeral-worker.yml",
"-o", "../operations/ephemeral-worker.yml",
)
})

2
topgun/runtime/http_proxy_test.go
View File

@ -9,7 +9,7 @@ import (
var _ = Describe("A worker with a proxy configured", func() {
BeforeEach(func() {
Deploy("deployments/concourse.yml", "-o", "operations/worker-proxy.yml")
Deploy("deployments/concourse.yml", "-o", "../operations/worker-proxy.yml")
})
It("uses the proxy server for executed tasks", func() {

2
topgun/runtime/placement_strategy_test.go
View File

@ -16,7 +16,7 @@ var _ = XDescribe("Fewest Build Containers Found Placement Strategy", func() {
var firstWorkerName string
var secondWorkerName string
BeforeEach(func() {
Deploy("deployments/concourse.yml", "-o", "operations/worker-instances.yml", "-v", "worker_instances=2", "-o", "operations/add-placement-strategy.yml")
Deploy("deployments/concourse.yml", "-o", "../operations/worker-instances.yml", "-v", "worker_instances=2", "-o", "operations/add-placement-strategy.yml")
})
Context("when there is a deployment the worker with the fewest containers is assigned the task to execute", func() {

4
topgun/runtime/resource_certs_test.go
View File

@ -12,8 +12,8 @@ var _ = Describe("Resource Certs", func() {
BeforeEach(func() {
Deploy(
"deployments/concourse.yml",
"-o", "operations/add-other-worker.yml",
"-o", "operations/other-worker-no-certs.yml",
"-o", "../operations/add-other-worker.yml",
"-o", "../operations/other-worker-no-certs.yml",
)
})

6
topgun/runtime/worker_failing_test.go
View File

@ -11,9 +11,9 @@ var _ = Describe("Worker failing", func() {
BeforeEach(func() {
Deploy(
"deployments/concourse.yml",
"-o", "operations/add-other-worker.yml",
"-o", "operations/other-worker-doomed.yml",
"-o", "operations/fast-gc.yml",
"-o", "../operations/add-other-worker.yml",
"-o", "../operations/other-worker-doomed.yml",
"-o", "../operations/fast-gc.yml",
)
})