From d08d8eeeebf4c358b62d0e4ba5ae2f2de4a60efd Mon Sep 17 00:00:00 2001 From: edward tsang Date: Tue, 1 Oct 2019 12:24:22 -0700 Subject: [PATCH 1/2] partial check in t make make test work on amc --- Makefile | 25 +++++++++++++------------ setTestEnv.sh | 11 ++++------- 2 files changed, 17 insertions(+), 19 deletions(-) mode change 100644 => 100755 setTestEnv.sh diff --git a/Makefile b/Makefile index 84f283f..fb60a7b 100644 --- a/Makefile +++ b/Makefile @@ -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 @@ -15,25 +16,25 @@ 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/. - docker build -t ${pmsImageRepo}:${pmsImageTag} --rm --no-cache deployment/docker/speedle-pms - rm deployment/docker/speedle-pms/speedle-pms + cp ${GOPATH}/bin/speedle-pms-${PLATFORM} deployment/docker/speedle-pms/. + docker build -t ${pmsImageRepo}:${pmsImageTag} --rm --no-cache deployment/docker/speedle-pms-${PLATFORM} + rm deployment/docker/speedle-pms/speedle-pms-${PLATFORM} imageAds: - cp ${GOPATH}/bin/speedle-ads deployment/docker/speedle-ads/. - docker build -t ${adsImageRepo}:${adsImageTag} --rm --no-cache deployment/docker/speedle-ads - rm deployment/docker/speedle-ads/speedle-ads + cp ${GOPATH}/bin/speedle-ads-${PLATFORM} deployment/docker/speedle-ads/. + docker build -t ${adsImageRepo}:${adsImageTag} --rm --no-cache deployment/docker/speedle-ads-${PLATFORM} + rm deployment/docker/speedle-ads/speedle-ads-${PLATFORM} test: testAll @@ -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} diff --git a/setTestEnv.sh b/setTestEnv.sh old mode 100644 new mode 100755 index 38dfa43..db97243 --- a/setTestEnv.sh +++ b/setTestEnv.sh @@ -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}" @@ -97,13 +98,9 @@ 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} function ensureTestDir() { if [ "$1" == "file" ];then From ab3484e968dd8c1a60ded18afa03f20316850c33 Mon Sep 17 00:00:00 2001 From: edward tsang Date: Tue, 1 Oct 2019 13:43:23 -0700 Subject: [PATCH 2/2] fix make docker image --- Makefile | 12 ++++++------ setTestEnv.sh | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index fb60a7b..9895c08 100644 --- a/Makefile +++ b/Makefile @@ -27,14 +27,14 @@ buildSpctl: image: imagePms imageAds imagePms: - cp ${GOPATH}/bin/speedle-pms-${PLATFORM} deployment/docker/speedle-pms/. - docker build -t ${pmsImageRepo}:${pmsImageTag} --rm --no-cache deployment/docker/speedle-pms-${PLATFORM} - rm deployment/docker/speedle-pms/speedle-pms-${PLATFORM} + 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-${PLATFORM} deployment/docker/speedle-ads/. - docker build -t ${adsImageRepo}:${adsImageTag} --rm --no-cache deployment/docker/speedle-ads-${PLATFORM} - rm deployment/docker/speedle-ads/speedle-ads-${PLATFORM} + 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 test: testAll diff --git a/setTestEnv.sh b/setTestEnv.sh index db97243..437e37c 100755 --- a/setTestEnv.sh +++ b/setTestEnv.sh @@ -101,6 +101,7 @@ shopt -s expand_aliases 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