diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 79f694f..9470bef 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -13,6 +13,9 @@ jobs: run-integration-test: name: Validate release and master branch runs-on: ubuntu-latest + env: + KUBECONFIG: /home/runner/.kube/config + PR_BASE_REF: ${{ github.event.pull_request.base.ref }} steps: - uses: actions/checkout@v2 name: Checkout from PR branch @@ -35,7 +38,7 @@ jobs: run: pip install requests - name: Validate kubectl setup - run: python test/validate-kubectl.py latest + run: python ./test/validate-kubectl.py latest - name: Setup kubectl uses: ./setup-kubectl diff --git a/test/validateKubectl.py b/test/validateKubectl.py deleted file mode 100644 index cff10a0..0000000 --- a/test/validateKubectl.py +++ /dev/null @@ -1,31 +0,0 @@ -import os, sys, json, requests, time - -version_to_check = sys.argv[1] -version_info = None -PASSED = False - -try: - print('kubectl version --client -o json') - version_info = json.load(os.popen('kubectl version --client -o json')) -except Exception as ex: - sys.exit('kubectl not installed') - -try: - if version_to_check == 'latest': - response = None - time_to_sleep = 2 - for _ in range(10): - response = requests.get('https://storage.googleapis.com/kubernetes-release/release/stable.txt') - if response.status_code == 200: - break - print('Failed to obtain latest version info, retrying.') - time.sleep(time_to_sleep) - time_to_sleep *= 2 - version_to_check = response.content.decode('utf-8') - PASSED = True if version_info['clientVersion']['gitVersion'] == version_to_check else False -except: - pass - -if not PASSED: - sys.exit('Setting up of '+version_to_check+' kubectl failed') -print('Test passed') \ No newline at end of file