Fix nightly performance tests

pulp · Nov 27, 2024 · 517975a · 517975a
1 parent 76d04d7
commit 517975a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/templates/github/.github/workflows/nightly.yml.j2 b/templates/github/.github/workflows/nightly.yml.j2
@@ -3,11 +3,10 @@
   checkout,
   setup_python,
   setup_ruby,
+  install_python_deps,
   setup_env,
   display_logs,
   run_script,
-  set_secrets,
-  install_python_deps,
   configure_git,
 with context %}
 ---
@@ -62,8 +61,8 @@ jobs:
 {%- if test_performance %}
 
   performance:
-    runs-on: ubuntu-latest
-    needs: test
+    runs-on: "ubuntu-latest"
+    needs: "test"
 
     strategy:
       fail-fast: false
@@ -83,7 +82,10 @@ jobs:
 
       {{ checkout(repository="pulp/pulp-openapi-generator", path="pulp-openapi-generator") | indent(6) }}
 
-      - uses: actions/download-artifact@v4
+      {{ setup_python() | indent(6) }}
+
+      - name: "Download plugin package"
+        uses: "actions/download-artifact@v4"
         with:
           name: "plugin_package"
           path: "{{ plugin_name }}/dist/"
@@ -93,6 +95,7 @@ jobs:
         with:
           name: "api_spec"
           path: "{{ plugin_name }}/"
+      {%- if plugins %}
 
       - name: "Download client packages"
         uses: "actions/download-artifact@v4"
@@ -109,20 +112,20 @@ jobs:
           tar xvf "../../{{ plugin_name }}/{{ plugin.app_label }}-python-client.tar"
           popd
           {%- endfor %}
+      {%- endif %}
 
-      {{ setup_python() | indent(6) }}
+      {{ install_python_deps(["towncrier", "twine", "wheel", "httpie", "docker", "netaddr", "boto3", "ansible~=10.3.0", "mkdocs", "jq", "jsonpatch", "bump-my-version"]) | indent(6) }}
 
       {{ setup_env(test="performance") | indent(6) }}
 
-      {{ install_python_deps(["towncrier", "twine", "wheel", "httpie", "docker", "netaddr", "boto3", "ansible", "mkdocs"]) | indent(6) }}
-
       {{ run_script(name="Before Install", file="before_install.sh") | indent(6) }}
 
       {{ run_script(name="Install", file="install.sh") | indent(6) }}
 
       {{ run_script(name="Before Script", file="before_script.sh", extra_env={"REDIS_DISABLED": "${{ contains('%s', matrix.env.TEST) }}" % (disabled_redis_runners | default(["TILT"]) | join(' '))}) | indent(6) }}
 
-      {{ run_script(name="Performance Test", file="script.sh") | indent(6) }}
+      {{ run_script(name="Script", file="script.sh") | indent(6) }}
 
       {{ display_logs() | indent(6) }}
 {%- endif %}
+...
diff --git a/templates/github/.github/workflows/test.yml.j2 b/templates/github/.github/workflows/test.yml.j2
@@ -81,10 +81,6 @@ jobs:
 
       {{ run_script(name="Before Install", file="before_install.sh") | indent(6) }}
 
-      {%- if deploy_client_to_rubygems %}
-      {{ setup_ruby(condition="${{ env.TEST == 'pulp' }}") | indent(6) }}
-      {%- endif %}
-
       {{ run_script(name="Install", file="install.sh") | indent(6) }}
 
       {{ run_script(name="Before Script", file="before_script.sh", extra_env={"REDIS_DISABLED": "${{ contains('%s', matrix.env.TEST) }}" % (disabled_redis_runners | default(["TILT"]) | join(' '))}) | indent(6) }}