From 89af9f8aafe0603ae59852014808e857832ac6f0 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Wed, 10 Feb 2021 08:53:11 +0000
Subject: [PATCH] chore: standardise structure [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/291
---
 .gitlab-ci.yml | 4 ++--
 .travis.yml    | 5 +++--
 kitchen.yml    | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d65e9a8..da9cf54 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -127,15 +127,15 @@ debian-debian-10-master-py3: {extends: '.test_instance'}
 # ubuntu-ubuntu-2004-master-py3: {extends: '.test_instance'}
 ubuntu-ubuntu-1804-master-py3: {extends: '.test_instance'}
 redhat8-centos-8-master-py3: {extends: '.test_instance'}
-redhat8-oraclelinux-8-master-py3: {extends: '.test_instance'}
 fedora-fedora-32-master-py3: {extends: '.test_instance'}
 # fedora-fedora-31-master-py3: {extends: '.test_instance'}
 # suse-opensuse-leap-152-master-py3: {extends: '.test_instance'}
 # amazon-amazonlinux-2-master-py3: {extends: '.test_instance'}
+redhat8-oraclelinux-8-master-py3: {extends: '.test_instance'}
 # debian-debian-10-3000-3-py3: {extends: '.test_instance'}
 # debian-debian-9-3000-3-py3: {extends: '.test_instance'}
 # ubuntu-ubuntu-1804-3000-3-py3: {extends: '.test_instance'}
-# centos-centos-8-3000-3-py3: {extends: '.test_instance'}
+# redhat8-centos-8-3000-3-py3: {extends: '.test_instance'}
 centos-centos-7-3000-3-py3: {extends: '.test_instance'}
 # fedora-fedora-31-3000-3-py3: {extends: '.test_instance'}
 suse-opensuse-leap-152-3000-3-py3: {extends: '.test_instance'}
diff --git a/.travis.yml b/.travis.yml
index a33efe5..cc2c3b3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -86,15 +86,16 @@ jobs:
     - env: INSTANCE=debian-debian-10-master-py3
     # - env: INSTANCE=ubuntu-ubuntu-2004-master-py3
     - env: INSTANCE=ubuntu-ubuntu-1804-master-py3
-    # - env: INSTANCE=centos-centos-8-master-py3
+    - env: INSTANCE=redhat8-centos-8-master-py3
     - env: INSTANCE=fedora-fedora-32-master-py3
     # - env: INSTANCE=fedora-fedora-31-master-py3
     # - env: INSTANCE=suse-opensuse-leap-152-master-py3
     # - env: INSTANCE=amazon-amazonlinux-2-master-py3
+    - env: INSTANCE=redhat8-oraclelinux-8-master-py3
     # - env: INSTANCE=debian-debian-10-3000-3-py3
     # - env: INSTANCE=debian-debian-9-3000-3-py3
     # - env: INSTANCE=ubuntu-ubuntu-1804-3000-3-py3
-    # - env: INSTANCE=centos-centos-8-3000-3-py3
+    # - env: INSTANCE=redhat8-centos-8-3000-3-py3
     - env: INSTANCE=centos-centos-7-3000-3-py3
     # - env: INSTANCE=fedora-fedora-31-3000-3-py3
     - env: INSTANCE=suse-opensuse-leap-152-3000-3-py3
diff --git a/kitchen.yml b/kitchen.yml
index 995dc09..3d165a2 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -246,8 +246,8 @@ suites:
   - name: redhat8
     includes:
       - centos-8-master-py3
-      - centos-8-3000-3-py3
       - oraclelinux-8-master-py3
+      - centos-8-3000-3-py3
     provisioner:
       state_top:
         base: