From f16575e5ebe114f24f8a427776f5bac54b78b2fc Mon Sep 17 00:00:00 2001
From: Arx Cruz <arxcruz@gmail.com>
Date: Tue, 7 May 2019 14:51:16 +0200
Subject: [PATCH] Update standalone master and rocky

Os_tempest doesn't have support yet to rocky, so we need to have
a job that doesn't inherit from tripleo-ci-centos-7-standalone on
rocky.

Change-Id: Idc9adfbe01f261092e51ca53960947fad74ca1e5
---
 zuul.d/multinode-jobs.yaml  |  1 +
 zuul.d/standalone-jobs.yaml | 37 +++++++++++++++++++++++++++++++------
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/zuul.d/multinode-jobs.yaml b/zuul.d/multinode-jobs.yaml
index fe5681154..3d2dc40e7 100644
--- a/zuul.d/multinode-jobs.yaml
+++ b/zuul.d/multinode-jobs.yaml
@@ -17,6 +17,7 @@
         - tripleo-ci-centos-7-scenario000-multinode-oooq-container-updates
         - tripleo-ci-centos-7-scenario000-multinode-oooq-container-upgrades
         - tripleo-ci-centos-7-standalone
+        - tripleo-ci-centos-7-standalone-rocky
         - tripleo-ci-fedora-28-standalone
         - tripleo-ci-centos-7-standalone-upgrade
         - tripleo-ci-centos-7-standalone-upgrade-stein
diff --git a/zuul.d/standalone-jobs.yaml b/zuul.d/standalone-jobs.yaml
index 1933a44a5..b75eaf695 100644
--- a/zuul.d/standalone-jobs.yaml
+++ b/zuul.d/standalone-jobs.yaml
@@ -7,11 +7,21 @@
     name: tripleo-ci-centos-7-standalone
     parent: tripleo-ci-base-standalone
     nodeset: single-centos-7-node
-    branches: ^(?!stable/(newton|ocata|pike|queens)).*$
+    branches: ^(?!stable/(newton|ocata|pike|queens|rocky)).*$
     vars:
       featureset: '052'
       featureset_override:
+        run_tempest: false
         tempest_format: container
+        tempest_run_concurrency: 2
+        tempest_tempest_conf_overrides:
+          auth.use_dynamic_credentials: true
+        tempest_test_whitelist:
+          - 'tempest.scenario.test_minimum_basic.TestMinimumBasicScenario'
+          - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps'
+          - 'tempest.scenario.test_volume_boot_pattern.TestVolumeBootPattern'
+          - '\[.*\bsmoke\b.*\]'
+        use_os_tempest: true
     irrelevant-files:
       - ^.*\.md$
       - ^.*\.rst$
@@ -25,14 +35,29 @@
       - tox.ini
       # like parent but with requirements.txt and setup.py removed
 
+# This job is rocky only!
+# os_tempest needs updates rocky, that's WIP
 - job:
     name: tripleo-ci-centos-7-standalone-rocky
-    parent: tripleo-ci-centos-7-standalone
-    voting: false
-    branches: master
-    override-checkout: 'stable/rocky'
+    parent: tripleo-ci-base-standalone
+    nodeset: single-centos-7-node
+    branches: stable/rocky
     vars:
-      branch_override: 'stable/rocky'
+      featureset: '052'
+      featureset_override:
+        tempest_format: container
+        use_os_tempest: false
+    irrelevant-files:
+      - ^.*\.md$
+      - ^.*\.rst$
+      - ^doc/.*$
+      - ^etc/.*$
+      - ^metadata.json$
+      - ^releasenotes/.*$
+      - ^test-requirements.txt$
+      - ^spec/.*$
+      - ^Puppetfile.*$
+      - tox.ini
 
 - job:
     name: tripleo-ci-fedora-28-standalone