admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
magicsong
2019-08-17 15:36:54 +08:00
parent 7314064e83
commit 6ce4b54ed5
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hack/gobuild.sh
View File

@@ -40,6 +40,6 @@ BUILD_GOARCH=${GOARCH:-amd64}
GOBINARY=${GOBINARY:-go} GOBINARY=${GOBINARY:-go}
# forgoing -i (incremental build) because it will be deprecated by tool chain. # 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} \ -o ${OUT} \
${BUILDPATH} ${BUILDPATH}

12
test/network/Jenkinsfile vendored
View File

@@ -15,13 +15,13 @@ pipeline {
sh 'mkdir -p ~/.kube' sh 'mkdir -p ~/.kube'
sh 'mkdir ./kustomize/network/etcd' sh 'mkdir ./kustomize/network/etcd'
withCredentials([kubeconfigContent(credentialsId: 'net-kubeconfig', variable: 'KUBECONFIG_CONTENT'), withCredentials([kubeconfigContent(credentialsId: 'net-kubeconfig', variable: 'KUBECONFIG_CONTENT'),
file(credentialsId: 'etcd-ca', variable: 'etcd-ca'), file(credentialsId: 'etcd-ca', variable: 'etcd_ca'),
file(credentialsId: 'etcd-crt', variable: 'etcd-crt'), file(credentialsId: 'etcd-crt', variable: 'etcd_crt'),
file(credentialsId: 'etcd-key', variable: 'etcd-key')]) { file(credentialsId: 'etcd-key', variable: 'etcd_key')]) {
sh 'echo "$KUBECONFIG_CONTENT" > ~/.kube/config' sh 'echo "$KUBECONFIG_CONTENT" > ~/.kube/config'
sh "cp \${etcd-ca} ./kustomize/network/etcd/ca" sh "cp \${etcd_ca} ./kustomize/network/etcd/ca"
sh "cp \${etcd-key} ./kustomize/network/etcd/key" sh "cp \${etcd_key} ./kustomize/network/etcd/key"
sh "cp \${etcd-crt} ./kustomize/network/etcd/crt" sh "cp \${etcd_crt} ./kustomize/network/etcd/crt"
} }
} }
} }