Skip to content
This repository was archived by the owner on Jun 16, 2020. It is now read-only.

makes make test work on mac #26

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

makes make test work on mac #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d08d8ee
partial check in t make make test work on amc
etsangsplk Oct 1, 2019
ab3484e
fix make docker image
etsangsplk Oct 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ gitCommit := $(shell git rev-parse --short HEAD)
# go version output is "go version go1.11.2 linux/amd64"
goVersion := $(word 3,$(shell go version))
goLDFlags := -ldflags "-X main.gitCommit=${gitCommit} -X main.productVersion=0.1 -X main.goVersion=${goVersion}"
PLATFORM := $(shell uname | tr '[:upper:]' '[:lower:]')

pmsImageRepo := speedle-pms
pmsImageTag := v0.1
Expand All @@ -15,23 +16,23 @@ all: build
build: buildPms buildAds buildSpctl

buildPms:
go build ${goLDFlags} -o ${GOPATH}/bin/speedle-pms github.com/oracle/speedle/cmd/speedle-pms
go build -o ${GOPATH}/bin/speedle-pms-${PLATFORM} ${goLDFlags} github.com/oracle/speedle/cmd/speedle-pms

buildAds:
go build ${goLDFlags} -o ${GOPATH}/bin/speedle-ads github.com/oracle/speedle/cmd/speedle-ads
go build -o ${GOPATH}/bin/speedle-ads-${PLATFORM} ${goLDFlags} github.com/oracle/speedle/cmd/speedle-ads

buildSpctl:
go build ${goLDFlags} -o ${GOPATH}/bin/spctl github.com/oracle/speedle/cmd/spctl
go build -o ${GOPATH}/bin/spctl-${PLATFORM} ${goLDFlags} github.com/oracle/speedle/cmd/spctl

image: imagePms imageAds

imagePms:
cp ${GOPATH}/bin/speedle-pms deployment/docker/speedle-pms/.
cp ${GOPATH}/bin/speedle-pms-${PLATFORM} deployment/docker/speedle-pms/speedle-pms
docker build -t ${pmsImageRepo}:${pmsImageTag} --rm --no-cache deployment/docker/speedle-pms
rm deployment/docker/speedle-pms/speedle-pms

imageAds:
cp ${GOPATH}/bin/speedle-ads deployment/docker/speedle-ads/.
cp ${GOPATH}/bin/speedle-ads-${PLATFORM} deployment/docker/speedle-ads/speedle-ads
docker build -t ${adsImageRepo}:${adsImageTag} --rm --no-cache deployment/docker/speedle-ads
rm deployment/docker/speedle-ads/speedle-ads

Expand Down Expand Up @@ -75,6 +76,6 @@ testSpeedleTls:
pkg/svcs/pmsrest/tls_test-force-client-cert.sh
clean:
rm -rf ${GOPATH}/pkg/linux_amd64/github.com/oracle/speedle
rm -f ${GOPATH}/bin/speedle-pms
rm -f ${GOPATH}/bin/speedle-ads
rm -f ${GOPATH}/bin/spctl
rm -f ${GOPATH}/bin/speedle-pms-${PLATFORM}
rm -f ${GOPATH}/bin/speedle-ads-${PLATFORM}
rm -f ${GOPATH}/bin/spctl-${PLATFORM}
12 changes: 5 additions & 7 deletions setTestEnv.sh
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ export ADS_ENDPOINT=http://127.0.0.1:6734
export PMS_ADMIN_TOKEN=
export ADS_ADMIN_TOKEN=
export SP_APP_NAME=spctl
export PLATFORM=$(uname | tr '[:upper:]' '[:lower:]')

echo "----------------------------------"
echo "PMS_ENDPOINT=${PMS_ENDPOINT}"
Expand Down Expand Up @@ -97,13 +98,10 @@ function waitService {
}

shopt -s expand_aliases
if [ `uname -s` == "Darwin" ] ; then
alias pms=${GOPATH}/bin/speedle-pms-mac
alias ads=${GOPATH}/bin/speedle-ads-mac
else
alias pms=${GOPATH}/bin/speedle-pms
alias ads=${GOPATH}/bin/speedle-ads
fi

alias pms=${GOPATH}/bin/speedle-pms-${PLATFORM}
alias ads=${GOPATH}/bin/speedle-ads-${PLATFORM}
alias spctl=${GOPATH}/bin/spctl-${PLATFORM}

function ensureTestDir() {
if [ "$1" == "file" ];then
Expand Down