From 29661c423d07dc6be3c4e01cdcbb7fa427d9dc44 Mon Sep 17 00:00:00 2001 From: Flavius Lacatusu Date: Thu, 13 May 2021 16:55:08 +0200 Subject: [PATCH] Revert to minikube Signed-off-by: Flavius Lacatusu --- .github/bin/common.sh | 2 +- .../test-operator-singlehost-gateway.sh | 1 + .../test-operator-singlehost-native.sh | 1 + .../minikube-operator-singlehost.yaml | 64 ++++--------------- 4 files changed, 16 insertions(+), 52 deletions(-) diff --git a/.github/bin/common.sh b/.github/bin/common.sh index 72513a702..e8eb1585d 100755 --- a/.github/bin/common.sh +++ b/.github/bin/common.sh @@ -331,7 +331,7 @@ function provisionOpenShiftOAuthUser() { } login() { - local oauth=$(kubect get checluster eclipse-che -n $NAMESPACE -o json | jq -r '.spec.auth.openShiftoAuth') + local oauth=$(kubectl get checluster eclipse-che -n $NAMESPACE -o json | jq -r '.spec.auth.openShiftoAuth') if [[ ${oauth} == "true" ]]; then # log in using OpenShift token chectl auth:login --chenamespace=${NAMESPACE} diff --git a/.github/bin/minikube/test-operator-singlehost-gateway.sh b/.github/bin/minikube/test-operator-singlehost-gateway.sh index 14f74b30b..193f47f34 100755 --- a/.github/bin/minikube/test-operator-singlehost-gateway.sh +++ b/.github/bin/minikube/test-operator-singlehost-gateway.sh @@ -38,5 +38,6 @@ runTest() { initDefaults initLatestTemplates prepareTemplates +buildCheOperatorImage copyCheOperatorImageToMinikube runTest diff --git a/.github/bin/minikube/test-operator-singlehost-native.sh b/.github/bin/minikube/test-operator-singlehost-native.sh index 2441224d7..f129093fe 100755 --- a/.github/bin/minikube/test-operator-singlehost-native.sh +++ b/.github/bin/minikube/test-operator-singlehost-native.sh @@ -37,5 +37,6 @@ runTest() { initDefaults initLatestTemplates prepareTemplates +buildCheOperatorImage copyCheOperatorImageToMinikube runTest diff --git a/.github/workflows/minikube-operator-singlehost.yaml b/.github/workflows/minikube-operator-singlehost.yaml index 34e5d71c9..c2750b02a 100644 --- a/.github/workflows/minikube-operator-singlehost.yaml +++ b/.github/workflows/minikube-operator-singlehost.yaml @@ -14,32 +14,16 @@ on: pull_request jobs: minikube-gateway: name: Testing latest changes (single-host/gateway) - runs-on: macos-latest + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v1 - - name: Build Che operator image - run: | - export OPERATOR_IMAGE=test/che-operator:test - # coreutils provides a readlink that supports `-f` - brew install coreutils docker docker-machine - mkdir -p ~/.docker/machine/cache/ - sudo curl -Lo ~/.docker/machine/cache/boot2docker.iso https://github.com/boot2docker/boot2docker/releases/download/v19.03.12/boot2docker.iso - docker-machine --github-api-token="${{ secrets.GITHUB_TOKEN }}" create --driver virtualbox default - eval "$(docker-machine env default)" - export PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH" - docker build -t "${OPERATOR_IMAGE}" -f Dockerfile . && docker save "${OPERATOR_IMAGE}" > /tmp/operator.tar - docker-machine stop + - name: Install yq + run: sudo pip install yq - name: Provision Minikube cluster run: | - curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-darwin-amd64 - sudo install minikube-darwin-amd64 /usr/local/bin/minikube - minikube start --memory=10000 --cpus=2 - - name: Install kubectl - run: | - curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/darwin/amd64/kubectl" - chmod +x ./kubectl - sudo mv ./kubectl /usr/local/bin/kubectl - kubectl version --client + curl -LO https://storage.googleapis.com/minikube/releases/v1.18.1/minikube-linux-amd64 + sudo install minikube-linux-amd64 /usr/local/bin/minikube + minikube start --memory=6000mb - name: Enable minikube addons run: | minikube addons enable ingress @@ -47,11 +31,8 @@ jobs: /bin/bash olm/minikube-registry-addon.sh & - name: Install chectl run: bash <(curl -sL https://www.eclipse.org/che/chectl/) --channel=next - - name: Install jq - run: brew install python-yq - name: Run tests - run: | - /bin/bash .github/bin/minikube/test-operator-singlehost-gateway.sh + run: /bin/bash .github/bin/minikube/test-operator-singlehost-gateway.sh # Run this step even the previous step fail to upload artifacts to GH - uses: actions/upload-artifact@v2 if: ${{ always() }} @@ -60,32 +41,16 @@ jobs: path: /tmp/artifacts-che minikube-native: name: Testing latest changes (single-host/native) - runs-on: macos-latest + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v1 - - name: Build Che operator image - run: | - export OPERATOR_IMAGE=test/che-operator:test - # coreutils provides a readlink that supports `-f` - brew install coreutils docker docker-machine - mkdir -p ~/.docker/machine/cache/ - sudo curl -Lo ~/.docker/machine/cache/boot2docker.iso https://github.com/boot2docker/boot2docker/releases/download/v19.03.12/boot2docker.iso - docker-machine --github-api-token="${{ secrets.GITHUB_TOKEN }}" create --driver virtualbox default - eval "$(docker-machine env default)" - export PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH" - docker build -t "${OPERATOR_IMAGE}" -f Dockerfile . && docker save "${OPERATOR_IMAGE}" > /tmp/operator.tar - docker-machine stop + - name: Install yq + run: sudo pip install yq - name: Provision Minikube cluster run: | - curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-darwin-amd64 - sudo install minikube-darwin-amd64 /usr/local/bin/minikube - minikube start --memory=10000 --cpus=2 - - name: Install kubectl - run: | - curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/darwin/amd64/kubectl" - chmod +x ./kubectl - sudo mv ./kubectl /usr/local/bin/kubectl - kubectl version --client + curl -LO https://storage.googleapis.com/minikube/releases/v1.18.1/minikube-linux-amd64 + sudo install minikube-linux-amd64 /usr/local/bin/minikube + minikube start --memory=6000mb - name: Enable minikube addons run: | minikube addons enable ingress @@ -93,9 +58,6 @@ jobs: /bin/bash olm/minikube-registry-addon.sh & - name: Install chectl run: bash <(curl -sL https://www.eclipse.org/che/chectl/) --channel=next - - name: Install yq - run: | - brew install python-yq - name: Run tests run: /bin/bash .github/bin/minikube/test-operator-singlehost-native.sh # Run this step even the previous step fail to upload artifacts to GH