Merge pull request #695 from virtual-kubelet/pires/revisit_e2e

e2e: misc improvements
This commit is contained in:
Brian Goff
2019-07-03 11:18:40 -07:00
committed by GitHub
3 changed files with 9 additions and 21 deletions

View File

@@ -33,21 +33,9 @@ jobs:
- run: - run:
name: Build name: Build
command: V=1 make build command: V=1 make build
- run:
name: Install Nomad
command: |
curl \
--silent \
--location \
--output nomad.zip \
https://releases.hashicorp.com/nomad/0.8.6/nomad_0.8.6_linux_amd64.zip && \
unzip nomad.zip && \
chmod +x nomad && \
mv nomad /go/bin/nomad && \
rm nomad.zip
- run: - run:
name: Tests name: Tests
command: V=1 CI=1 SKIP_AWS_E2E=1 make test command: V=1 CI=1 make test
e2e: e2e:
machine: machine:
@@ -57,12 +45,12 @@ jobs:
CHANGE_MINIKUBE_NONE_USER: true CHANGE_MINIKUBE_NONE_USER: true
GOPATH: /home/circleci/go GOPATH: /home/circleci/go
KUBECONFIG: /home/circleci/.kube/config KUBECONFIG: /home/circleci/.kube/config
KUBERNETES_VERSION: v1.12.3 KUBERNETES_VERSION: v1.13.7
MINIKUBE_HOME: /home/circleci MINIKUBE_HOME: /home/circleci
MINIKUBE_VERSION: v0.30.0 MINIKUBE_VERSION: v1.2.0
MINIKUBE_WANTUPDATENOTIFICATION: false MINIKUBE_WANTUPDATENOTIFICATION: false
MINIKUBE_WANTREPORTERRORPROMPT: false MINIKUBE_WANTREPORTERRORPROMPT: false
SKAFFOLD_VERSION: v0.18.0 SKAFFOLD_VERSION: v0.33.0
GO111MODULE: "on" GO111MODULE: "on"
steps: steps:
- checkout - checkout
@@ -77,13 +65,13 @@ jobs:
- run: - run:
name: Install Skaffold name: Install Skaffold
command: | command: |
curl -Lo skaffold https://github.com/GoogleContainerTools/skaffold/releases/download/${SKAFFOLD_VERSION}/skaffold-linux-amd64 curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/${SKAFFOLD_VERSION}/skaffold-linux-amd64
chmod +x skaffold chmod +x skaffold
sudo mv skaffold /usr/local/bin/ sudo mv skaffold /usr/local/bin/
- run: - run:
name: Install Minikube name: Install Minikube
command: | command: |
curl -Lo minikube https://github.com/kubernetes/minikube/releases/download/${MINIKUBE_VERSION}/minikube-linux-amd64 curl -Lo minikube https://storage.googleapis.com/minikube/releases/${MINIKUBE_VERSION}/minikube-linux-amd64
chmod +x minikube chmod +x minikube
sudo mv minikube /usr/local/bin/ sudo mv minikube /usr/local/bin/
- run: - run:
@@ -110,7 +98,7 @@ jobs:
command: | command: |
mkdir $HOME/.go mkdir $HOME/.go
export PATH=$HOME/.go/bin:${PATH} export PATH=$HOME/.go/bin:${PATH}
curl -fsSL -o "/tmp/go.tar.gz" "https://dl.google.com/go/go1.12.5.linux-amd64.tar.gz" curl -fsSL -o "/tmp/go.tar.gz" "https://dl.google.com/go/go1.12.6.linux-amd64.tar.gz"
tar -C $HOME/.go --strip-components=1 -xzf "/tmp/go.tar.gz" tar -C $HOME/.go --strip-components=1 -xzf "/tmp/go.tar.gz"
go version go version
make e2e make e2e

View File

@@ -1,7 +1,7 @@
.PHONY: skaffold.validate .PHONY: skaffold.validate
skaffold.validate: kubectl_context := $(shell kubectl config current-context) skaffold.validate: kubectl_context := $(shell kubectl config current-context)
skaffold.validate: skaffold.validate:
if [[ ! "minikube,docker-for-desktop,docker-desktop" =~ .*"$(kubectl_context)".* ]]; then \ @if [[ ! "minikube,docker-for-desktop,docker-desktop" =~ .*"$(kubectl_context)".* ]]; then \
echo current-context is [$(kubectl_context)]. Must be one of [minikube,docker-for-desktop,docker-desktop]; \ echo current-context is [$(kubectl_context)]. Must be one of [minikube,docker-for-desktop,docker-desktop]; \
false; \ false; \
fi fi

View File

@@ -1,4 +1,4 @@
apiVersion: skaffold/v1alpha5 apiVersion: skaffold/v1beta12
kind: Config kind: Config
build: build:
artifacts: artifacts: