Skip to content
This repository has been archived by the owner on Jan 24, 2023. It is now read-only.

Commit

Permalink
Update how portal proxy tests are run (#150)
Browse files Browse the repository at this point in the history
* Update how portal proxy tests are run

* Update concourse scripts

* Update run-tests script

* Debugging...

* Update concourse scripts

* Change cert location

* Remove erronous volume mapping

* Update concourse scripts
  • Loading branch information
Irfan Habib authored and nwmac committed Jun 1, 2017
1 parent c486f6d commit ed6f1cb
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 7 deletions.
2 changes: 1 addition & 1 deletion ci/scripts/generate_cert.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

# Settings
pproxy_path=portal-proxy-output
pproxy_path=portal-proxy-output/
domain=pproxy
commonname=192.168.99.100
country=US
Expand Down
5 changes: 3 additions & 2 deletions ci/tasks/portal-proxy/run-unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@ run:
mkdir -p /go/src/github.com/hpcloud/
ln -s $PWD/portal-proxy /go/src/github.com/hpcloud/portal-proxy
cd /go/src/github.com/hpcloud/portal-proxy
glide install
go test -v $(go list ./... | grep -v /vendor/)
npm install
npm install -g gulp
npm run test
14 changes: 11 additions & 3 deletions ci/tasks/stratos-ui/prep-proxy-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ platform: linux
image_resource:
type: docker-image
source:
repository: 10.4.21.241:5000/stackatodev/hsc-console-proxy-builder
repository: 10.4.21.241:5000/susetest/console-proxy-builder
tag: "latest"
insecure_registries: [ "10.4.21.241:5000" ]

Expand All @@ -20,8 +20,16 @@ run:
mkdir -p /go/src/github.com/hpcloud
cp -r ./portal-proxy /go/src/github.com/hpcloud
cd /go/src/github.com/hpcloud/portal-proxy
glide install
go build
cat << EOF > plugins.json
{
"enabledPlugins": [
"cloud-foundry"
]
}
EOF
npm install
npm install -g gulp
npm run build
cd -
cp -r /go/src/github.com/hpcloud/portal-proxy/. ./portal-proxy-output
sh ./stratos-deploy/ci/scripts/generate_cert.sh
1 change: 0 additions & 1 deletion common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ services:
env_file:
./proxy.env
volumes:
- $GOPATH/src/github.com/hpcloud/portal-proxy:/srv
- ./hsc-upgrade-volume:/hsc-upgrade-volume


Expand Down

0 comments on commit ed6f1cb

Please sign in to comment.