darkkirb/harness-drone
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

automatically install cf tool to resolve issue #193

Browse source
This commit is contained in:
Ke Zhu 2014-04-20 23:52:42 -04:00
parent 25f167b34a
commit b009768e41
2 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkg/plugin/deploy/cloudfoundry.go
View file

@ -16,6 +16,13 @@ type CloudFoundry struct {
} }
func (cf *CloudFoundry) Write(f *buildfile.Buildfile) { func (cf *CloudFoundry) Write(f *buildfile.Buildfile) {
downloadCmd := "curl -sLO http://go-cli.s3-website-us-east-1.amazonaws.com/releases/latest/cf-cli_amd64.deb"
installCmd := "dpkg -i cf-cli_amd64.deb 1> /dev/null 2> /dev/null"
// download and install the cf tool
f.WriteCmdSilent(fmt.Sprintf("[ -f /usr/bin/sudo ] && sudo %s || %s", downloadCmd, downloadCmd))
f.WriteCmdSilent(fmt.Sprintf("[ -f /usr/bin/sudo ] && sudo %s || %s", installCmd, installCmd))
// login // login
loginCmd := "cf login -a %s -u %s -p %s" loginCmd := "cf login -a %s -u %s -p %s"

25
pkg/plugin/deploy/cloudfoundry_test.go
View file

@ -61,6 +61,21 @@ func setUpWithCF(input string) (string, error) {
return bf.String(), err return bf.String(), err
} }
func TestCloudFoundryToolInstall(t *testing.T) {
bscr, err := setUpWithCF(sampleYmlBasic)
if err != nil {
t.Fatalf("Can't unmarshal deploy script: %s", err)
}
if !strings.Contains(bscr, "curl -sLO http://go-cli.s3-website-us-east-1.amazonaws.com/releases/latest/cf-cli_amd64.deb") {
t.Error("Expect script to contain download command")
}
if !strings.Contains(bscr, "dpkg -i cf-cli_amd64.deb") {
t.Error("Expect script to contain install command")
}
}
func TestCloudFoundryDeployment(t *testing.T) { func TestCloudFoundryDeployment(t *testing.T) {
bscr, err := setUpWithCF(sampleYmlBasic) bscr, err := setUpWithCF(sampleYmlBasic)
if err != nil { if err != nil {
@ -68,11 +83,11 @@ func TestCloudFoundryDeployment(t *testing.T) {
} }
if !strings.Contains(bscr, "cf login -a https://api.example.com -u foo -p bar") { if !strings.Contains(bscr, "cf login -a https://api.example.com -u foo -p bar") {
t.Error("Expect login script to contains username and password") t.Error("Expect login script to contain username and password")
} }
if !strings.Contains(bscr, "cf push") { if !strings.Contains(bscr, "cf push") {
t.Error("Expect script to contains push") t.Error("Expect script to contain push")
} }
} }
@ -83,7 +98,7 @@ func TestCloudFoundryDeploymentWithOrg(t *testing.T) {
} }
if !strings.Contains(bscr, "cf login -a https://api.example.com -u foo -p bar -o custom-org") { if !strings.Contains(bscr, "cf login -a https://api.example.com -u foo -p bar -o custom-org") {
t.Error("Expect login script to contains organization") t.Error("Expect login script to contain organization")
} }
} }
@ -94,7 +109,7 @@ func TestCloudFoundryDeploymentWithSpace(t *testing.T) {
} }
if !strings.Contains(bscr, "cf login -a https://api.example.com -u foo -p bar -o custom-org -s dev") { if !strings.Contains(bscr, "cf login -a https://api.example.com -u foo -p bar -o custom-org -s dev") {
t.Error("Expect login script to contains space") t.Error("Expect login script to contain space")
} }
} }
@ -105,6 +120,6 @@ func TestCloudFoundryDeploymentWithApp(t *testing.T) {
} }
if !strings.Contains(bscr, "cf push test-app") { if !strings.Contains(bscr, "cf push test-app") {
t.Error("Expect login script to contains app name") t.Error("Expect login script to contain app name")
} }
} }