Merge "Reflect recent test.yaml changes in osci.yaml"

osci.yaml

@@ -1,4 +1,42 @@
 - project:
     templates:
       - charm-unit-jobs
-      - charm-functional-jobs
+    check:
+      jobs:
+      - rabbit-xenial
+      - rabbit-bionic
+      - rabbit-focal
+      - rabbit-groovy
+    vars:
+      needs_charm_build: false
+
+- job:
+    name: rabbit-xenial
+    parent: func-target
+    dependencies: &smoke-jobs
+      - rabbit-focal
+    vars:
+      tox_extra_args: xenial-mitaka
+- job:
+    name: rabbit-bionic
+    parent: func-target
+    dependencies: *smoke-jobs
+    vars:
+      tox_extra_args: bionic-queens
+- job:
+    name: rabbit-focal
+    parent: func-target
+    dependencies: &lint-jobs
+        - osci-lint
+        - tox-py35
+        - tox-py36
+        - tox-py37
+        - tox-py38
+    vars:
+      tox_extra_args: focal-ussuri
+- job:
+    name: rabbit-groovy
+    parent: func-target
+    dependencies: *smoke-jobs
+    vars:
+      tox_extra_args: groovy-victoria