Update CI and makefile to use u22.04 and py3.10

Author: nzlosh

.github/workflows/ci.yaml

@@ -19,19 +19,19 @@ jobs:
 
   lint-checks:
     needs: pre_job
-    name: Make requirements and lint check on Python3.6
-    runs-on: ubuntu-18.04
+    name: Make requirements and lint check on Python3.10
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout st2tests repository
         uses: actions/checkout@v2
       - name: Checkout st2 repository
         uses: actions/checkout@v2
         with:
           repository: "StackStorm/st2"
-      - name: Set up Python3.6
-        uses: actions/setup-python@v2
+      - name: Set up Python3.10
+        uses: actions/setup-python@v4
         with:
-          python-version: '3.6.13'
+          python-version: '3.10.12'
       - name: Install apt dependencies
         run: |
           sudo apt install -y libldap2-dev libsasl2-dev

Makefile

@@ -14,7 +14,7 @@ space_char +=
 comma := ,
 COMPONENT_PYTHONPATH = $(subst $(space_char),:,$(realpath $(COMPONENTS)))
 
-PYTHON_TARGET := 3.6
+PYTHON_TARGET := 3.10
 
 REQUIREMENTS := test-requirements.txt requirements.txt
 # Grab the version of pip from the Makefile in the st2 repository
@@ -107,8 +107,8 @@ requirements: virtualenv
 
 	# Install requirements
 	for req in $(REQUIREMENTS); do \
-			echo "Installing $$req..." ; \
-			$(VIRTUALENV_DIR)/bin/pip install $(PIP_OPTIONS) -r $$req ; \
+		echo "Installing $$req..." ; \
+		$(VIRTUALENV_DIR)/bin/pip install $(PIP_OPTIONS) -r $$req ; \
 	done
 
 .PHONY: virtualenv
@@ -117,7 +117,7 @@ $(VIRTUALENV_DIR)/bin/activate:
 	@echo
 	@echo "==================== virtualenv ===================="
 	@echo
-	test -d $(VIRTUALENV_DIR) || virtualenv $(VIRTUALENV_DIR)
+	test -d $(VIRTUALENV_DIR) || python3 -m venv $(VIRTUALENV_DIR)
 
 	# Setup PYTHONPATH in bash activate script...
 	echo '' >> $(VIRTUALENV_DIR)/bin/activate