From 0eb4c8221c55b468dd9187b081dcefcec9adfe10 Mon Sep 17 00:00:00 2001
From: Ross Williams <ross@ross-williams.net>
Date: Sat, 9 Oct 2021 03:11:00 +0000
Subject: [PATCH] pkgng: CI seems to dislike plus-signs in filenames

---
 .../{+COMPACT_MANIFEST => COMPACT_MANIFEST}     |  0
 .../{+MANIFEST => MANIFEST}                     |  0
 tests/integration/targets/pkgng/tasks/main.yml  | 17 +++++++++++++----
 3 files changed, 13 insertions(+), 4 deletions(-)
 rename tests/integration/targets/pkgng/files/zsh_test_package_manifests/{+COMPACT_MANIFEST => COMPACT_MANIFEST} (100%)
 rename tests/integration/targets/pkgng/files/zsh_test_package_manifests/{+MANIFEST => MANIFEST} (100%)

diff --git a/tests/integration/targets/pkgng/files/zsh_test_package_manifests/+COMPACT_MANIFEST b/tests/integration/targets/pkgng/files/zsh_test_package_manifests/COMPACT_MANIFEST
similarity index 100%
rename from tests/integration/targets/pkgng/files/zsh_test_package_manifests/+COMPACT_MANIFEST
rename to tests/integration/targets/pkgng/files/zsh_test_package_manifests/COMPACT_MANIFEST
diff --git a/tests/integration/targets/pkgng/files/zsh_test_package_manifests/+MANIFEST b/tests/integration/targets/pkgng/files/zsh_test_package_manifests/MANIFEST
similarity index 100%
rename from tests/integration/targets/pkgng/files/zsh_test_package_manifests/+MANIFEST
rename to tests/integration/targets/pkgng/files/zsh_test_package_manifests/MANIFEST
diff --git a/tests/integration/targets/pkgng/tasks/main.yml b/tests/integration/targets/pkgng/tasks/main.yml
index 36df68b9c5..5b42f254b1 100644
--- a/tests/integration/targets/pkgng/tasks/main.yml
+++ b/tests/integration/targets/pkgng/tasks/main.yml
@@ -131,6 +131,15 @@
             dest: /tmp/
             follow: yes
 
+        - name: Add plus-sign to package manifest filenames on testhost
+          copy:
+            src: "/tmp/zsh_test_package_manifests/{{ item }}"
+            remote_src: yes
+            dest: "/tmp/zsh_test_package_manifests/+{{ 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
 
@@ -147,26 +156,26 @@
 
         - name: Check for available package upgrade (checkmode)
           pkgng:
-            name: freebsd-release-manifests
+            name: zsh
             state: latest
           check_mode: yes
           register: pkgng_example4_checkmode
 
         - name: Upgrade out-of-date package
           pkgng:
-            name: freebsd-release-manifests
+            name: zsh
             state: latest
           register: pkgng_example4
 
         - name: Upgrade out-of-date package (idempotent)
           pkgng:
-            name: freebsd-release-manifests
+            name: zsh
             state: latest
           register: pkgng_example4_idempotent
 
         - name: Remove test out-of-date package
           pkgng:
-            name: freebsd-release-manifests
+            name: zsh
             state: absent
 
         - name: Ensure pkgng upgrades package correctly