Merge pull request #332 from setswei/FixUnitTests

arm4b · web-flow · commit 8532b968cb53 · 2023-10-19T12:20:04.000+01:00
Fix e2e tests, drop Ubuntu18
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -53,7 +53,6 @@ jobs:
           - unstable
         os:
           - centos7
-          - ubuntu18
           - rockylinux8
           - ubuntu20
         ansible-core:
@@ -66,6 +65,7 @@ jobs:
       - name: Install Python dependencies
         run: |
           python3 -m pip install --upgrade pip
+          python3 -m pip install --upgrade "requests<=2.29.0"
           python3 -m pip install --upgrade ansible-core==${{ matrix.ansible-core }}
           python3 -m pip install --upgrade molecule==${{ env.MOLECULE_VERSION }}
           python3 -m pip install --upgrade molecule-docker==${{ env.MOLECULE_DOCKER_VERSION }}
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,6 @@
 
 # Log files
 *.log
+
+# Virtual Environment
+.venv
diff --git a/README.md b/README.md
@@ -10,12 +10,11 @@
 
 ## Supported platforms
 
-* Ubuntu Bionic (18.04)
 * Ubuntu Focal (20.04)
 * RHEL 7 and CentOS 7
 * RHEL 8 and Rocky Linux 8
 
-> If you are using the provided [`Vagrantfile`](Vagrantfile), note that it uses Bionic by default.
+> If you are using the provided [`Vagrantfile`](Vagrantfile), note that it uses Focal by default.
 
 > In order to access StackStorm Web UI, please do not forget to ensure that the http and https ports are allowed by the firewall.
 
@@ -110,7 +109,6 @@ There are a few requirements when developing on `ansible-st2`.
 
 These are the platforms we must support (must pass end-to-end testing):
 
-* Ubuntu Bionic (18.04)
 * Ubuntu Focal (20.04)
 * CentOS 7
 * Rocky Linux 8
@@ -121,7 +119,7 @@ The playbooks and roles must support Ansible idempotence.
 That is, re-running the `stackstorm.yml` playbook must end with the result `changed=0.*failed=0` (provided that versions and revisions are pinned).
 
 For local development, there is a [Vagrantfile](Vagrantfile) available.
-By default, the following command will set up an ubuntu18 box (`ubuntu/bionic64`):
+By default, the following command will set up an ubuntu20 box (`ubuntu/focal64`):
 
 ```sh
 vagrant up
diff --git a/Vagrantfile b/Vagrantfile
@@ -2,10 +2,6 @@
 # vi: set ft=ruby :
 
 VIRTUAL_MACHINES = {
-  :ubuntu18 => {
-    :hostname => 'ansible-st2-ubuntu18',
-    :box => 'ubuntu/bionic64',
-  },
   :ubuntu20 => {
     :hostname => 'ansible-st2-ubuntu20',
     :box => 'ubuntu/focal64',
@@ -27,7 +23,7 @@ Vagrant.configure(2) do |config|
   config.ssh.forward_agent = true
 
   VIRTUAL_MACHINES.each do |name, cfg|
-    config.vm.define name, autostart: (name == :ubuntu18) do |vm_config|
+    config.vm.define name, autostart: (name == :ubuntu20) do |vm_config|
       vm_config.vm.hostname = cfg[:hostname]
       vm_config.vm.box = cfg[:box]
 
diff --git a/meta/main.yml b/meta/main.yml
@@ -16,7 +16,6 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
-        - bionic
         - focal
     - name: EL
       versions:
diff --git a/molecule/ubuntu18/Dockerfile.ubuntu18.j2 b/molecule/ubuntu18/Dockerfile.ubuntu18.j2
diff --git a/molecule/ubuntu18/molecule.yml b/molecule/ubuntu18/molecule.yml
diff --git a/roles/StackStorm.mongodb/meta/main.yml b/roles/StackStorm.mongodb/meta/main.yml
@@ -8,7 +8,6 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
-        - bionic
         - focal
     - name: EL
       versions:
diff --git a/roles/StackStorm.nginx/meta/main.yml b/roles/StackStorm.nginx/meta/main.yml
@@ -9,7 +9,6 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
-        - bionic
         - focal
     - name: EL
       versions:
diff --git a/roles/StackStorm.nodejs/meta/main.yml b/roles/StackStorm.nodejs/meta/main.yml
@@ -9,7 +9,6 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
-        - bionic
         - focal
     - name: EL
       versions:
diff --git a/roles/StackStorm.rabbitmq/meta/main.yml b/roles/StackStorm.rabbitmq/meta/main.yml
@@ -8,7 +8,6 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
-        - bionic
         - focal
     - name: EL
       versions:
diff --git a/roles/StackStorm.redis/meta/main.yml b/roles/StackStorm.redis/meta/main.yml
@@ -8,7 +8,6 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
-        - bionic
         - focal
     - name: EL
       versions:
diff --git a/roles/StackStorm.st2/meta/main.yml b/roles/StackStorm.st2/meta/main.yml
@@ -8,7 +8,6 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
-        - bionic
         - focal
     - name: EL
       versions:
diff --git a/roles/StackStorm.st2chatops/meta/main.yml b/roles/StackStorm.st2chatops/meta/main.yml
@@ -8,7 +8,6 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
-        - bionic
         - focal
     - name: EL
       versions:
diff --git a/roles/StackStorm.st2repo/meta/main.yml b/roles/StackStorm.st2repo/meta/main.yml
@@ -8,7 +8,6 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
-        - bionic
         - focal
     - name: EL
       versions:
diff --git a/roles/StackStorm.st2smoketests/meta/main.yml b/roles/StackStorm.st2smoketests/meta/main.yml
@@ -8,7 +8,6 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
-        - bionic
         - focal
     - name: EL
       versions:
diff --git a/roles/StackStorm.st2web/meta/main.yml b/roles/StackStorm.st2web/meta/main.yml
@@ -9,7 +9,6 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
-        - bionic
         - focal
     - name: EL
       versions:
