ci: simplify integration tests ci code for helm2

This commit is contained in:
Andrey Tuzhilin 2021-03-15 22:33:57 +03:00 committed by Yusuke Kuoka
parent d1a2435ce1
commit f1c07879ad
2 changed files with 16 additions and 13 deletions

View File

@ -1,4 +1,5 @@
HELM_VERSION ?= v3.5.3 HELM_VERSION ?= v3.5.3
HELM2_VERSION ?= v2.17.0
KUSTOMIZE_VERSION ?= v3.8.8 KUSTOMIZE_VERSION ?= v3.8.8
K8S_VERSION ?= v1.13.12 K8S_VERSION ?= v1.13.12
MINIKUBE_VERSION ?= v0.30.0 MINIKUBE_VERSION ?= v0.30.0
@ -10,6 +11,7 @@ MINIKUBE_WANTREPORTERRORPROMPT ?= false
tmp := $(shell mktemp -d) tmp := $(shell mktemp -d)
HELM_FILENAME := helm-${HELM_VERSION}-linux-amd64.tar.gz HELM_FILENAME := helm-${HELM_VERSION}-linux-amd64.tar.gz
HELM2_FILENAME := helm-${HELM2_VERSION}-linux-amd64.tar.gz
KUSTOMIZE_FILENAME := kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz KUSTOMIZE_FILENAME := kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz
@ -22,6 +24,13 @@ helm:
sudo mv ${tmp}/linux-amd64/helm /usr/local/bin/ sudo mv ${tmp}/linux-amd64/helm /usr/local/bin/
.PHONY: helm .PHONY: helm
helm2:
curl -sSLo $(tmp)/${HELM2_FILENAME} "https://kubernetes-helm.storage.googleapis.com/${HELM2_FILENAME}"
tar zxf $(tmp)/${HELM2_FILENAME} --directory ${tmp} linux-amd64/helm
chmod +x ${tmp}/linux-amd64/helm
sudo mv ${tmp}/linux-amd64/helm /usr/local/bin/
.PHONY: helm2
kustomize: kustomize:
curl -sSLo $(tmp)/${KUSTOMIZE_FILENAME} "https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2F${KUSTOMIZE_VERSION}/${KUSTOMIZE_FILENAME}" curl -sSLo $(tmp)/${KUSTOMIZE_FILENAME} "https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2F${KUSTOMIZE_VERSION}/${KUSTOMIZE_FILENAME}"
tar zxf $(tmp)/${KUSTOMIZE_FILENAME} --directory ${tmp} kustomize tar zxf $(tmp)/${KUSTOMIZE_FILENAME} --directory ${tmp} kustomize

View File

@ -88,22 +88,14 @@ jobs:
command: | command: |
cp ~/build/helmfile ~/project/helmfile cp ~/build/helmfile ~/project/helmfile
cp ~/build/diff-yamls ~/project/diff-yamls cp ~/build/diff-yamls ~/project/diff-yamls
- run: - run: make -C .circleci helm2
name: Install helm
environment:
HELM_VERSION: v2.17.0
command: |
HELM_FILENAME="helm-${HELM_VERSION}-linux-amd64.tar.gz"
curl -Lo ${HELM_FILENAME} "https://kubernetes-helm.storage.googleapis.com/${HELM_FILENAME}"
tar zxf ${HELM_FILENAME} linux-amd64/helm
chmod +x linux-amd64/helm
sudo mv linux-amd64/helm /usr/local/bin/
- run: make -C .circleci kustomize - run: make -C .circleci kustomize
- run: make -C .circleci minikube - run: make -C .circleci minikube
- run: - run:
name: Execute integration tests name: Execute integration tests
environment:
TERM: "xterm"
command: | command: |
export TERM=xterm
make integration make integration
integration_tests_helm3: integration_tests_helm3:
@ -123,9 +115,11 @@ jobs:
- run: make -C .circleci minikube - run: make -C .circleci minikube
- run: - run:
name: Execute integration tests name: Execute integration tests
environment:
HELMFILE_HELM3: "1"
TERM: "xterm"
command: | command: |
export TERM=xterm make integration
HELMFILE_HELM3=1 make integration
# GITHUB_TOKEN env var must be setup in circleci console # GITHUB_TOKEN env var must be setup in circleci console