mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-09 16:00:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: move HELM_VERSION to build.env

Browse Source 
Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2020-06-22 14:48:32 +02:00 committed by mergify[bot]
parent 079459c247
commit 21946ae345
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -23,7 +23,6 @@ env:
- TEST_COVERAGE=stdout - TEST_COVERAGE=stdout
- GO_METALINTER_THREADS=1 - GO_METALINTER_THREADS=1
- GO_COVER_DIR=_output - GO_COVER_DIR=_output
- HELM_VERSION=v3.1.2
- VM_DRIVER=none - VM_DRIVER=none
- MINIKUBE_VERSION=v1.6.0 - MINIKUBE_VERSION=v1.6.0
- CHANGE_MINIKUBE_NONE_USER=true - CHANGE_MINIKUBE_NONE_USER=true
@ -74,6 +73,7 @@ jobs:
"https://raw.githubusercontent.com/securego/gosec/master/install.sh" "https://raw.githubusercontent.com/securego/gosec/master/install.sh"
| sh -s -- -b $GOPATH/bin "${GOSEC_VERSION}" | sh -s -- -b $GOPATH/bin "${GOSEC_VERSION}"
# install helm for helm lint # install helm for helm lint
- export HELM_VERSION=$(source build.env ; echo ${HELM_VERSION})
- curl -L https://git.io/get_helm.sh - curl -L https://git.io/get_helm.sh
| bash -s -- -v "${HELM_VERSION}" | bash -s -- -v "${HELM_VERSION}"
# yamllint disable rule:line-length # yamllint disable rule:line-length

3
build.env
View File

@ -16,3 +16,6 @@ GO111MODULE=on
# static checks and linters # static checks and linters
GOLANGCI_VERSION=v1.21.0 GOLANGCI_VERSION=v1.21.0
GOSEC_VERSION=2.0.0 GOSEC_VERSION=2.0.0
# helm chart generation, testing and publishing
HELM_VERSION=v3.1.2

2
scripts/install-helm.sh
View File

@ -5,7 +5,7 @@
TEMP="/tmp/cephcsi-helm-test" TEMP="/tmp/cephcsi-helm-test"
HELM="helm" HELM="helm"
HELM_VERSION=${HELM_VERSION:-"v3.1.2"} HELM_VERSION=${HELM_VERSION:-"latest"}
arch="${ARCH:-}" arch="${ARCH:-}"
CEPHFS_CHART_NAME="ceph-csi-cephfs" CEPHFS_CHART_NAME="ceph-csi-cephfs"
RBD_CHART_NAME="ceph-csi-rbd" RBD_CHART_NAME="ceph-csi-rbd"

11
scripts/travis-helmtest.sh
View File

@ -10,6 +10,17 @@ export KUBE_VERSION=$1
kube_version() { kube_version() {
echo "${KUBE_VERSION}" | sed 's/^v//' | cut -d'.' -f"${1}" echo "${KUBE_VERSION}" | sed 's/^v//' | cut -d'.' -f"${1}"
} }
# configure global environment variables
# shellcheck source=build.env
source "$(dirname "${0}")/../build.env"
cat << EOF | sudo tee -a /etc/environment
HELM_VERSION=${HELM_VERSION}
EOF
# helm is installed from this shell, not a new one that reads /etc/environment
export HELM_VERSION=${HELM_VERSION}
sudo scripts/minikube.sh up sudo scripts/minikube.sh up
sudo scripts/minikube.sh deploy-rook sudo scripts/minikube.sh deploy-rook
sudo scripts/minikube.sh create-block-pool sudo scripts/minikube.sh create-block-pool