From 8b86a3b79002cc2ba5362dcd841ec3c34537fd47 Mon Sep 17 00:00:00 2001 From: prateekpandey14 Date: Thu, 8 Apr 2021 11:44:43 +0530 Subject: [PATCH] fix ci image tag Signed-off-by: prateekpandey14 --- .travis.yml | 6 +++--- ci/build-maya.sh | 10 ++++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3bd688a7e..c6aca1bd6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,13 +46,13 @@ install: true - make format before_script: -- curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/v1.20.1/bin/linux/amd64/kubectl +- curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/linux/amd64/kubectl && chmod +x kubectl && sudo mv kubectl /usr/local/bin/ -- curl -Lo minikube https://storage.googleapis.com/minikube/releases/v1.16.0/minikube-linux-amd64 +- curl -Lo minikube https://storage.googleapis.com/minikube/releases/v1.8.1/minikube-linux-amd64 && chmod +x minikube && sudo mv minikube /usr/local/bin/ - mkdir -p $HOME/.kube $HOME/.minikube - touch $KUBECONFIG -- sudo minikube start --profile=minikube --vm-driver=none --kubernetes-version=v1.20.1 +- sudo minikube start --profile=minikube --vm-driver=none --kubernetes-version=v1.18.1 - minikube update-context --profile=minikube - "sudo chown -R travis: /home/travis/.minikube/" - eval "$(minikube docker-env --profile=minikube)" && export DOCKER_CLI='docker' diff --git a/ci/build-maya.sh b/ci/build-maya.sh index 3273dbc3a..c0e4e6bd4 100755 --- a/ci/build-maya.sh +++ b/ci/build-maya.sh @@ -12,12 +12,10 @@ IMAGE_ORG=${IMAGE_ORG:-openebs} set -e # If any of the images aren't present the script will exit returning # a non zero exit code, which will result in a build failure. -if [ ${CI_TAG} != "ci" ]; then - sudo docker tag ${IMAGE_ORG}/m-apiserver-amd64:ci ${IMAGE_ORG}/m-apiserver:${CI_TAG} - sudo docker tag ${IMAGE_ORG}/cstor-pool-mgmt-amd64:ci ${IMAGE_ORG}/cstor-pool-mgmt:${CI_TAG} - sudo docker tag ${IMAGE_ORG}/cstor-volume-mgmt-amd64:ci ${IMAGE_ORG}/cstor-volume-mgmt:${CI_TAG} - sudo docker tag ${IMAGE_ORG}/admission-server-amd64:ci ${IMAGE_ORG}/admission-server:${CI_TAG} -fi +sudo docker tag ${IMAGE_ORG}/m-apiserver-amd64:ci ${IMAGE_ORG}/m-apiserver:${CI_TAG} +sudo docker tag ${IMAGE_ORG}/cstor-pool-mgmt-amd64:ci ${IMAGE_ORG}/cstor-pool-mgmt:${CI_TAG} +sudo docker tag ${IMAGE_ORG}/cstor-volume-mgmt-amd64:ci ${IMAGE_ORG}/cstor-volume-mgmt:${CI_TAG} +sudo docker tag ${IMAGE_ORG}/admission-server-amd64:ci ${IMAGE_ORG}/admission-server:${CI_TAG} #Tag the images with quay.io, since the operator can either have quay or docker images #Note the quay tags are hard-coded to help with CI scripts that might use the quay.io/openebs prefix