miscellaneous CI updates

Signed-off-by: jdolitsky <[email protected]>

.github/workflows/build-pr.yml

@@ -22,7 +22,7 @@ jobs:
       - name: build binary
         run: make build-linux
       - name: run acceptance tests
-        run: make acceptance
+        run: sudo pip install virtualenv && make acceptance
       - name: upload coverage report
         uses: actions/upload-artifact@master
         with:

.github/workflows/build.yml

@@ -25,7 +25,7 @@ jobs:
       - name: build binary
         run: make build-linux
       - name: run acceptance tests
-        run: make acceptance
+        run: sudo pip install virtualenv && make acceptance
       - name: upload coverage report
         uses: actions/upload-artifact@master
         with:

acceptance_tests/lib/ChartMuseum.py

@@ -59,10 +59,7 @@ def wait_for_chartmuseum(self):
             seconds_waited += 1
 
     def stop_chartmuseum(self):
-        if os.getenv('IS_BUSYBOX'):
-            self.run_command('pkill -9 KILLME')
-        else:
-            self.run_command('pkill -9 chartmuseum')
+        self.run_command('pkill -9 chartmuseum')
         shutil.rmtree(common.STORAGE_DIR, ignore_errors=True)
 
     def remove_chartmuseum_logs(self):

scripts/acceptance.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -ex
 
-PY_REQUIRES="requests==2.24.0 robotframework==3.2.1"
+PY_REQUIRES="requests==2.24.0 robotframework==3.2.2"
 
 REQUIRED_TEST_STORAGE_ENV_VARS=(
     "TEST_STORAGE_AMAZON_BUCKET"
@@ -33,22 +33,14 @@ else
     PLATFORM="linux"
 fi
 
-if [ -x "$(command -v busybox)" ]; then
-  export IS_BUSYBOX=1
-fi
-
 export PATH="$PWD/testbin:$PWD/bin/$PLATFORM/amd64:$PATH"
 
 mkdir -p .robot/
 
-if [ "$IS_BUSYBOX" != "1" ]; then
-    export HELM_HOME="$PWD/.helm"
-    helm init --client-only
-    if [ ! -d .venv/ ]; then
-        virtualenv -p $(which python3) .venv/
-        .venv/bin/python .venv/bin/pip install $PY_REQUIRES
-    fi
-    .venv/bin/robot --outputdir=.robot/ acceptance_tests/
-else
-    robot --outputdir=.robot/ acceptance_tests/
+export HELM_HOME="$PWD/.helm"
+helm init --client-only
+if [ ! -d .venv/ ]; then
+  virtualenv -p $(which python3) .venv/
+  .venv/bin/python .venv/bin/pip install $PY_REQUIRES
 fi
+.venv/bin/robot --outputdir=.robot/ acceptance_tests/

scripts/setup_test_environment.sh

@@ -7,15 +7,9 @@ cd $DIR/../
 
 export PATH="$PWD/testbin:$PATH"
 
-if [ -x "$(command -v busybox)" ]; then
-  export IS_BUSYBOX=1
-fi
-
 main() {
-    if [ "$IS_BUSYBOX" != "1" ]; then
-        export HELM_HOME="$PWD/.helm"
-        install_helm
-    fi
+    export HELM_HOME="$PWD/.helm"
+    install_helm
     package_test_charts
 }