From ded7dd5411b9c2610850251fc95287d3e12677dc Mon Sep 17 00:00:00 2001 From: DanG100 Date: Fri, 28 Oct 2022 21:19:43 +0000 Subject: [PATCH] wip experimental --- cloudbuild/presubmit.sh | 20 +++++++++----------- cloudbuild/presubmit.yaml | 14 ++++---------- 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/cloudbuild/presubmit.sh b/cloudbuild/presubmit.sh index aefdd8c9..fa369406 100755 --- a/cloudbuild/presubmit.sh +++ b/cloudbuild/presubmit.sh @@ -14,17 +14,15 @@ # limitations under the License. -set -xe +set -xeE -export PATH=${PATH}:/usr/local/go/bin -gopath=$(go env GOPATH) -export PATH=${PATH}:$gopath/bin -curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/latest/skaffold-linux-amd64 && \ -sudo install skaffold /usr/local/bin/ +printf "\n apiServerPort: 6443" >> /kne-internal/kind/kind-no-cni.yaml +sed -i "s/name: kne/name: kne\n recycle: true/g" /kne-internal/deploy/kne/kind-bridge.yaml -cd /tmp/workspace -kne deploy ~/kne-internal/deploy/kne/kind-bridge.yaml +kne deploy /kne-internal/deploy/kne/kind-bridge.yaml || true +mkdir -p ~/.kube +kind get kubeconfig --internal --name kne > ~/.kube/config +docker network connect kind "$(cat /etc/hostname)" -skaffold run -m lemming-operator -make load -make itest \ No newline at end of file +kne deploy /kne-internal/deploy/kne/kind-bridge.yaml +make itest diff --git a/cloudbuild/presubmit.yaml b/cloudbuild/presubmit.yaml index 1cbb30a5..10e64119 100644 --- a/cloudbuild/presubmit.yaml +++ b/cloudbuild/presubmit.yaml @@ -13,16 +13,10 @@ # limitations under the License. steps: - - id: remote_builder_test - name: gcr.io/$PROJECT_ID/remote-builder - env: - - USERNAME=user - - SSH_ARGS=--internal-ip --ssh-key-expire-after=1d - - INSTANCE_NAME=kne-presubmit-$BUILD_ID - - INSTANCE_ARGS=--network cloudbuild-workers --image-project gep-kne --image-family kne --machine-type e2-standard-16 --preemptible - - ZONE=us-central1-a - - REMOTE_WORKSPACE=/tmp/workspace - - COMMAND=source /tmp/workspace/cloudbuild/presubmit.sh 2>&1 + - id: local_test + name: gcr.io/$PROJECT_ID/kne-kind + entrypoint: 'bash' + args: ['cloudbuild/presubmit.sh'] timeout: 1800s