ci(suite): fix and enable full ci again

saltstack-formulas · Aug 13, 2021 · 5af33ef · 5af33ef
1 parent 38ab789
commit 5af33ef
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 21 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -149,13 +149,13 @@ debian-10-master-py3: {extends: '.test_instance'}
 ### ubuntu-2004-master-py3: {extends: '.test_instance'}
 # default-ubuntu-1804-master-py3: {extends: '.test_instance'}
 # nopillars-ubuntu-1804-master-py3: {extends: '.test_instance'}
-### ubuntu-1804-master-py3: {extends: '.test_instance'}
+ubuntu-1804-master-py3: {extends: '.test_instance'}
 # default-centos-8-master-py3: {extends: '.test_instance'}
 # nopillars-centos-8-master-py3: {extends: '.test_instance'}
-### centos-8-master-py3: {extends: '.test_instance'}
+centos-8-master-py3: {extends: '.test_instance'}
 # default-centos-7-master-py3: {extends: '.test_instance'}
 # nopillars-centos-7-master-py3: {extends: '.test_instance'}
-### centos-7-master-py3: {extends: '.test_instance'}
+centos-7-master-py3: {extends: '.test_instance'}
 default-fedora-34-master-py3: {extends: '.test_instance'}
 # nopillars-fedora-34-master-py3: {extends: '.test_instance'}
 # fedora-34-master-py3: {extends: '.test_instance'}
@@ -176,10 +176,10 @@ default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
 # amazonlinux-2-master-py3: {extends: '.test_instance'}
 # default-oraclelinux-8-master-py3: {extends: '.test_instance'}
 # nopillars-oraclelinux-8-master-py3: {extends: '.test_instance'}
-### oraclelinux-8-master-py3: {extends: '.test_instance'}
+oraclelinux-8-master-py3: {extends: '.test_instance'}
 # default-oraclelinux-7-master-py3: {extends: '.test_instance'}
 # nopillars-oraclelinux-7-master-py3: {extends: '.test_instance'}
-### oraclelinux-7-master-py3: {extends: '.test_instance'}
+oraclelinux-7-master-py3: {extends: '.test_instance'}
 # default-arch-base-latest-master-py3: {extends: '.test_instance'}
 # nopillars-arch-base-latest-master-py3: {extends: '.test_instance'}
 # arch-base-latest-master-py3: {extends: '.test_instance'}
@@ -191,10 +191,10 @@ default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
 # gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
 # default-almalinux-8-master-py3: {extends: '.test_instance'}
 # nopillars-almalinux-8-master-py3: {extends: '.test_instance'}
-### almalinux-8-master-py3: {extends: '.test_instance'}
+# almalinux-8-master-py3: {extends: '.test_instance'}
 # default-rockylinux-8-master-py3: {extends: '.test_instance'}
 # nopillars-rockylinux-8-master-py3: {extends: '.test_instance'}
-### rockylinux-8-master-py3: {extends: '.test_instance'}
+rockylinux-8-master-py3: {extends: '.test_instance'}
 # default-debian-11-3003-1-py3: {extends: '.test_instance'}
 # default-debian-10-3003-1-py3: {extends: '.test_instance'}
 # default-debian-9-3003-1-py3: {extends: '.test_instance'}

diff --git a/rabbitmq/config/init.sls b/rabbitmq/config/init.sls
@@ -6,9 +6,9 @@ include:
   - .vhosts
   - .users
   - .queues
-  - .policies
   - .plugins
   - .exchanges
   - .bindings
-  - .parameters
   - .clusters
+  - .policies
+  - .parameters
diff --git a/test/integration/default/files/_mapdata/almalinux-8.yaml b/test/integration/default/files/_mapdata/almalinux-8.yaml
@@ -177,7 +177,7 @@ values:
           component: federation-upstream-set
           definition:
             upstream: my-federation-upstream1
-          vhost: default_vhost
+          vhost: rabbit2_vhost
         my-federation-upstream1:
           component: federation-upstream
           definition:

diff --git a/test/integration/default/files/_mapdata/centos-7.yaml b/test/integration/default/files/_mapdata/centos-7.yaml
@@ -180,7 +180,7 @@ values:
           component: federation-upstream-set
           definition:
             upstream: my-federation-upstream1
-          vhost: default_vhost
+          vhost: rabbit2_vhost
         my-federation-upstream1:
           component: federation-upstream
           definition:

diff --git a/test/integration/default/files/_mapdata/centos-8.yaml b/test/integration/default/files/_mapdata/centos-8.yaml
@@ -180,7 +180,7 @@ values:
           component: federation-upstream-set
           definition:
             upstream: my-federation-upstream1
-          vhost: default_vhost
+          vhost: rabbit2_vhost
         my-federation-upstream1:
           component: federation-upstream
           definition:

diff --git a/test/integration/default/files/_mapdata/debian-11.yaml b/test/integration/default/files/_mapdata/debian-11.yaml
@@ -176,7 +176,7 @@ values:
           component: federation-upstream-set
           definition:
             upstream: my-federation-upstream1
-          vhost: default_vhost
+          vhost: rabbit2_vhost
         my-federation-upstream1:
           component: federation-upstream
           definition:

diff --git a/test/integration/default/files/_mapdata/debian-9.yaml b/test/integration/default/files/_mapdata/debian-9.yaml
@@ -177,7 +177,7 @@ values:
           component: federation-upstream-set
           definition:
             upstream: my-federation-upstream1
-          vhost: default_vhost
+          vhost: rabbit2_vhost
         my-federation-upstream1:
           component: federation-upstream
           definition:

diff --git a/test/integration/default/files/_mapdata/fedora-32.yaml b/test/integration/default/files/_mapdata/fedora-32.yaml
@@ -180,7 +180,7 @@ values:
           component: federation-upstream-set
           definition:
             upstream: my-federation-upstream1
-          vhost: default_vhost
+          vhost: rabbit2_vhost
         my-federation-upstream1:
           component: federation-upstream
           definition:

diff --git a/test/integration/default/files/_mapdata/oraclelinux-7.yaml b/test/integration/default/files/_mapdata/oraclelinux-7.yaml
@@ -177,7 +177,7 @@ values:
           component: federation-upstream-set
           definition:
             upstream: my-federation-upstream1
-          vhost: default_vhost
+          vhost: rabbit2_vhost
         my-federation-upstream1:
           component: federation-upstream
           definition:

diff --git a/test/integration/default/files/_mapdata/oraclelinux-8.yaml b/test/integration/default/files/_mapdata/oraclelinux-8.yaml
@@ -177,7 +177,7 @@ values:
           component: federation-upstream-set
           definition:
             upstream: my-federation-upstream1
-          vhost: default_vhost
+          vhost: rabbit2_vhost
         my-federation-upstream1:
           component: federation-upstream
           definition:

diff --git a/test/integration/default/files/_mapdata/rockylinux-8.yaml b/test/integration/default/files/_mapdata/rockylinux-8.yaml
@@ -177,7 +177,7 @@ values:
           component: federation-upstream-set
           definition:
             upstream: my-federation-upstream1
-          vhost: default_vhost
+          vhost: rabbit2_vhost
         my-federation-upstream1:
           component: federation-upstream
           definition:

diff --git a/test/integration/default/files/_mapdata/ubuntu-16.yaml b/test/integration/default/files/_mapdata/ubuntu-16.yaml
@@ -178,7 +178,7 @@ values:
           component: federation-upstream-set
           definition:
             upstream: my-federation-upstream1
-          vhost: default_vhost
+          vhost: rabbit2_vhost
         my-federation-upstream1:
           component: federation-upstream
           definition:

diff --git a/test/integration/default/files/_mapdata/ubuntu-18.yaml b/test/integration/default/files/_mapdata/ubuntu-18.yaml
@@ -178,7 +178,7 @@ values:
           component: federation-upstream-set
           definition:
             upstream: my-federation-upstream1
-          vhost: default_vhost
+          vhost: rabbit2_vhost
         my-federation-upstream1:
           component: federation-upstream
           definition:

diff --git a/test/integration/default/files/_mapdata/ubuntu-20.yaml b/test/integration/default/files/_mapdata/ubuntu-20.yaml
@@ -178,7 +178,7 @@ values:
           component: federation-upstream-set
           definition:
             upstream: my-federation-upstream1
-          vhost: default_vhost
+          vhost: rabbit2_vhost
         my-federation-upstream1:
           component: federation-upstream
           definition: