Bug fixes 2.x pr devel 2.x

.github/workflows/ce-provision-test-gitlab.yml.NOPE → .github/workflows/ce-provision-test-gitlab.yml

@@ -31,12 +31,12 @@ jobs:
           sudo mv ./mkcert /usr/local/bin && cd ../
           sudo chmod +x /usr/local/bin/mkcert
           rm -Rf mkcert
-          curl -sL https://raw.githubusercontent.com/codeenigma/ce-dev/1.x/install.sh | /bin/sh -s -- linux
+          curl -sL https://raw.githubusercontent.com/codeenigma/ce-dev/${{ github.event.pull_request.base.ref }}/install.sh | /bin/sh -s -- --platform linux
 
       # Uses the ce-dev stack to run a test provision
       - name: Run a test provision
         if: ${{ github.event.pull_request.head.ref != 'documentation' }}
         run: |
-          git clone --branch 1.x https://github.com/codeenigma/ce-dev-ce-provision-config.git config
-          /bin/bash ce-dev/ansible/test.sh --examples gitlab --own-branch ${{ github.event.pull_request.base.ref }} --config-branch ${{ github.event.pull_request.base.ref }}
+          git clone --branch ${{ github.event.pull_request.base.ref }} https://github.com/codeenigma/ce-dev-ce-provision-config.git config
+          /bin/bash ce-dev/ansible/test.sh --examples gitlab --own-branch ${{ github.event.pull_request.head.ref }} --config-branch ${{ github.event.pull_request.base.ref }}
         shell: bash

ce-dev/ansible/plays/gitlab/gitlab.yml

@@ -16,24 +16,24 @@
     - ansible.builtin.import_role:
         name: _init
     - ansible.builtin.import_role:
-        name: user_provision
+        name: debian/user_provision
     - ansible.builtin.import_role:
         name: _meta/common_base
     - ansible.builtin.import_role:
-        name: ce_deploy
+        name: debian/ce_deploy
     - ansible.builtin.import_role:
         name: aws/aws_credentials
     - ansible.builtin.import_role:
-        name: gitlab
+        name: debian/gitlab
     - ansible.builtin.import_role:
-        name: gitlab_runner
+        name: debian/gitlab_runner
     - ansible.builtin.import_role:
-        name: ssh_server
+        name: debian/ssh_server
     - ansible.builtin.import_role:
-        name: sops
+        name: debian/sops
     - ansible.builtin.import_role:
-        name: gpg_key
+        name: debian/gpg_key
     - ansible.builtin.import_role:
-        name: firewall_config
+        name: debian/firewall_config
     - ansible.builtin.import_role:
         name: _exit