Merge "Improme install jobs to run the simlar workload as tox -eself"

openstack · Mar 19, 2020 · de4fe90 · de4fe90
2 parents d6a2110 + 445be80
commit de4fe90
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 17 deletions.
diff --git a/.zuul.d/python-jobs.yaml b/.zuul.d/python-jobs.yaml
@@ -3,7 +3,7 @@
     parent: unittests
     pre-run: tests/ci/playbooks/tox-install.yaml
     run: tests/ci/playbooks/tox-run.yaml
-    post-run: tests/ci/playbooks/rally-tox-base-post-run.yaml
+    post-run: tests/ci/playbooks/fetch-html-and-json-reports.yaml
     description: |
       Run test for rally project.
 

diff --git a/.zuul.d/zuul.yaml b/.zuul.d/zuul.yaml
@@ -3,6 +3,7 @@
     parent: base
     pre-run: tests/ci/playbooks/rally-install-pre.yaml
     run: tests/ci/playbooks/rally-install-run.yaml
+    post-run: tests/ci/playbooks/fetch-html-and-json-reports.yaml
     timeout: 1800
 
 - job:
@@ -62,6 +63,7 @@
         - rally-tox-pep8
         - rally-tox-py36
         - rally-tox-py37
+        - rally-tox-py38
         - rally-tox-cover
         - rally-tox-functional
         - rally-tox-self

diff --git a/...ci/playbooks/rally-tox-base-post-run.yaml → ...laybooks/fetch-html-and-json-reports.yaml b/...ci/playbooks/rally-tox-base-post-run.yaml → ...laybooks/fetch-html-and-json-reports.yaml
@@ -1,8 +1,8 @@
 - hosts: all
   vars:
     results_dir: "{{ zuul.project.src_dir }}/.test_results/"
-    html_report: "{{ tox_env }}_report.html"
-    json_report: "{{ tox_env }}_report.json"
+    html_report: "{{ tox_env | default('self') }}_report.html"
+    json_report: "{{ tox_env | default('self') }}_report.json"
   tasks:
     - shell: "ls {{ results_dir }}"
       register: results_dir_stat
@@ -39,4 +39,4 @@
           zuul:
             artifacts:
               - name: "JSON report"
-                url: "{{ json_report }}"
+                url: "{{ json_report }}"
diff --git a/tests/ci/playbooks/rally-install-run.yaml b/tests/ci/playbooks/rally-install-run.yaml
@@ -19,17 +19,8 @@
         chdir: '{{ zuul.project.src_dir }}'
         cmd: "sudo pip3 install --constraint ./upper-constraints.txt ./"
 
-    - name: Check Rally base commands
+    - name: Execute the similar script as `tox -e self`
       shell:
-        cmd: |
-          rally --version
-          rally db create
-          rally env list
-
-          # should be loaded from ~/.rally/plugins
-          rally plugin show --name FakePlugin.testplugin
-
-          # builtin plugin
-          rally plugin show --name HttpRequests.check_request
-
-        executable: /bin/sh
+        chdir: '{{ zuul.project.src_dir }}'
+        executable: /bin/bash
+        cmd: './tests/ci/rally_self_job.sh ./rally-jobs/self-rally.yaml'