fix ci

Signed-off-by: jdolitsky <393494+jdolitsky@users.noreply.github.com>

.github/workflows/build-pr.yml

@@ -16,11 +16,11 @@ jobs:
         with:
           go-version: '1.15.3'
       - name: run unit tests
-        run: make test
+        run: sudo pip install virtualenv && make test
       - name: build binary
         run: make build_linux
       - name: run acceptance tests
-        run: sudo pip install virtualenv && make acceptance
+        run: make acceptance
       - name: upload coverage report
         uses: actions/upload-artifact@master
         with:

.github/workflows/build.yml

@@ -15,11 +15,11 @@ jobs:
         with:
           go-version: '1.15.3'
       - name: run unit tests
-        run: make test
+        run: sudo pip install virtualenv && make test
       - name: build binary
         run: make build_linux
       - name: run acceptance tests
-        run: sudo pip install virtualenv && make acceptance
+        run: make acceptance
       - name: upload coverage report
         uses: actions/upload-artifact@master
         with:

acceptance_tests/lib/common.py

@@ -43,8 +43,11 @@ def run_command(self, command, detach=False):
                                    stdout=subprocess.PIPE,
                                    stderr=subprocess.STDOUT)
         if not detach:
-            stdout = process.communicate()[0].strip()
-            print(stdout)
+            stdout = process.communicate()[0].strip().decode()
             self.rc = process.returncode
-            # Remove debug lines that start with "+ "
-            self.stdout = '\n'.join(filter(lambda x: not x.startswith('+ '), stdout.split('\n')))
+            tmp = []
+            for x in stdout.split('\n'):
+                print(x)
+                if not x.startswith('+ '): # Remove debug lines that start with "+ "
+                    tmp.append(x)
+            self.stdout = '\n'.join(tmp)

scripts/acceptance.sh

@@ -22,7 +22,7 @@ export TEST_V3_XDG_CONFIG_HOME="$PWD/.helm3/xdg/config"
 export TEST_V3_XDG_DATA_HOME="$PWD/.helm3/xdg/data"
 
 if [ ! -d .venv/ ]; then
-    virtualenv -p $(which python2.7) .venv/
+    virtualenv -p $(which python3) .venv/
     .venv/bin/python .venv/bin/pip install $PY_REQUIRES
 fi