From 6ce4b54ed5d5f663e6375b59275df772b6c5e386 Mon Sep 17 00:00:00 2001 From: magicsong Date: Sat, 17 Aug 2019 15:36:54 +0800 Subject: [PATCH] fix --- hack/gobuild.sh | 2 +- test/network/Jenkinsfile | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hack/gobuild.sh b/hack/gobuild.sh index 0622ec940..d0a37bfe7 100755 --- a/hack/gobuild.sh +++ b/hack/gobuild.sh @@ -40,6 +40,6 @@ BUILD_GOARCH=${GOARCH:-amd64} GOBINARY=${GOBINARY:-go} # forgoing -i (incremental build) because it will be deprecated by tool chain. -time GOOS=${BUILD_GOOS} GOARCH=${BUILD_GOARCH} ${GOBINARY} build \ +time GOOS=${BUILD_GOOS} CGO_ENABLED=0 GOARCH=${BUILD_GOARCH} ${GOBINARY} build \ -o ${OUT} \ ${BUILDPATH} diff --git a/test/network/Jenkinsfile b/test/network/Jenkinsfile index 0a718d521..96e4919f4 100644 --- a/test/network/Jenkinsfile +++ b/test/network/Jenkinsfile @@ -15,13 +15,13 @@ pipeline { sh 'mkdir -p ~/.kube' sh 'mkdir ./kustomize/network/etcd' withCredentials([kubeconfigContent(credentialsId: 'net-kubeconfig', variable: 'KUBECONFIG_CONTENT'), - file(credentialsId: 'etcd-ca', variable: 'etcd-ca'), - file(credentialsId: 'etcd-crt', variable: 'etcd-crt'), - file(credentialsId: 'etcd-key', variable: 'etcd-key')]) { + file(credentialsId: 'etcd-ca', variable: 'etcd_ca'), + file(credentialsId: 'etcd-crt', variable: 'etcd_crt'), + file(credentialsId: 'etcd-key', variable: 'etcd_key')]) { sh 'echo "$KUBECONFIG_CONTENT" > ~/.kube/config' - sh "cp \${etcd-ca} ./kustomize/network/etcd/ca" - sh "cp \${etcd-key} ./kustomize/network/etcd/key" - sh "cp \${etcd-crt} ./kustomize/network/etcd/crt" + sh "cp \${etcd_ca} ./kustomize/network/etcd/ca" + sh "cp \${etcd_key} ./kustomize/network/etcd/key" + sh "cp \${etcd_crt} ./kustomize/network/etcd/crt" } } }