From 752817cf5a544e66a0d1efce04e56f3eb0d593be Mon Sep 17 00:00:00 2001
From: Ross Williams <ross@ross-williams.net>
Date: Sat, 9 Oct 2021 03:24:15 +0000
Subject: [PATCH] pkgng: refactor renaming test package manifests

refactored to make intent of adding '+' sign clearer
---
 .../integration/targets/pkgng/tasks/main.yml  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/integration/targets/pkgng/tasks/main.yml b/tests/integration/targets/pkgng/tasks/main.yml
index 5b42f254b1..cbda1db3fb 100644
--- a/tests/integration/targets/pkgng/tasks/main.yml
+++ b/tests/integration/targets/pkgng/tasks/main.yml
@@ -125,23 +125,23 @@
       #
       when: ansible_distribution_version is version('12.0', '>=')
       block:
-        - name: Copy intentionally out-of-date package manifest to testhost
-          copy:
-            src: zsh_test_package_manifests
-            dest: /tmp/
-            follow: yes
+        - name: Create temporary directory to assemble test package
+          file:
+            state: directory
+            path: /tmp/zsh_test_package
 
-        - name: Add plus-sign to package manifest filenames on testhost
+        - name: Copy intentionally out-of-date package manifests to testhost
           copy:
-            src: "/tmp/zsh_test_package_manifests/{{ item }}"
-            remote_src: yes
-            dest: "/tmp/zsh_test_package_manifests/+{{ item }}"
+            src: zsh_test_package_manifests/{{ item }}
+            # Plus-sign must be added at the destination
+            # CI doesn't like files with '+' in them in the repository
+            dest: /tmp/zsh_test_package/+{{ item }}
           loop:
             - COMPACT_MANIFEST
             - MANIFEST
 
         - name: Create out-of-date test package
-          command: tar -C /tmp/zsh_test_package_manifests -cJf /tmp/zsh-0__test.pkg +COMPACT_MANIFEST +MANIFEST
+          command: tar -C /tmp/zsh_test_package -cJf /tmp/zsh-0__test.pkg +COMPACT_MANIFEST +MANIFEST
 
         - name: Install out-of-date test package
           command: pkg add /tmp/zsh-0__test.pkg