Merge pull request #44 from puppetlabs/1.6.2-release

1.6.2 release mergeback

Author: Magisus

CHANGELOG.md

@@ -9,6 +9,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 No unreleased changes.
 
+## [1.6.3](https://github.com/puppetlabs/puppetlabs-cd4pe_jobs/tree/1.6.3)
+
+### Fixed
+- Fixed misleading Puppet version requirements accidentally released in 1.6.2.
+
+## [1.6.2](https://github.com/puppetlabs/puppetlabs-cd4pe_jobs/tree/1.6.2)
+
+### Fixed
+- Fixed issue in tarball unpacking where pax header lines were causing some long filenames to be truncated.
+
+
 ## [1.6.1](https://github.com/puppetlabs/puppetlabs-cd4pe_jobs/tree/1.6.1)
 
 ### Fixed

README.md

@@ -11,16 +11,17 @@ To run tests (from root of repo):
 ```shell
 git checkout -b 1.6.0-release
 ```
-2. On the new branch, update CHANGELOG.md with any changes in this release and metadata.json with the new version number.
-3. Commit these changes
-4. Tag the new branch with the new version number
+2. On a new branch based on the release branch, update CHANGELOG.md with any changes in this release and metadata.json with the new version number.
+3. Commit these changes and put up a PR against the release branch you created in Step 1 and get review.
+4. Once the changes have been approved and merged to the release branch, pull down the updated release branch and tag the module.
 ```shell
 git tag -a 1.6.0 -m "1.6.0"
 ```
-5. Push your changes to origin for PR review and merge
-```shell
-git push origin 1.6.0-release --follow-tags
-```   
-6. Run `pdk build` in the root of the module to get the new tarball
+6. Run `pdk build --force` in the root of the module to get the new tarball. The `force` flag is required because this module is not fully compatible with modern PDK versions, and we don't want the PDK to attempt to convert anything. This is the same thing we do with the `cd4peadm` module.
 7. Log into https://forge.puppet.com as 'puppetlabs' and publish the new module version
 8. Update the ref in PE: https://github.com/puppetlabs/pe-tasks-vanagon/blob/main/configs/components/puppetlabs-cd4pe_jobs.json. This will ensure that the new version is shipped with the next PE release.
+9. Push your new tag up to the repo
+```shell
+git push --tags
+```
+10. Make a PR from the release branch back to `master`. Once this is merged the release branch should be deleted.

metadata.json

@@ -1,43 +1,78 @@
 {
   "name": "puppetlabs-cd4pe_jobs",
-  "version": "1.6.1",
+  "version": "1.6.3",
   "author": "puppetlabs",
   "summary": "Contains Bolt task to facilitate running of CD4PE jobs.",
   "license": "proprietary",
   "source": "https://github.com/puppetlabs/puppetlabs-cd4pe_jobs",
-  "dependencies": [],
+  "project_page": "https://github.com/puppetlabs/puppetlabs-cd4pe_jobs",
+  "dependencies": [
+
+  ],
   "operatingsystem_support": [
     {
       "operatingsystem": "RedHat",
-      "operatingsystemrelease": ["5", "6", "7", "8"]
+      "operatingsystemrelease": [
+        "5",
+        "6",
+        "7",
+        "8"
+      ]
     },
     {
       "operatingsystem": "CentOS",
-      "operatingsystemrelease": ["5", "6", "7", "8"]
+      "operatingsystemrelease": [
+        "5",
+        "6",
+        "7",
+        "8"
+      ]
     },
     {
       "operatingsystem": "OracleLinux",
-      "operatingsystemrelease": ["5", "6", "7"]
+      "operatingsystemrelease": [
+        "5",
+        "6",
+        "7"
+      ]
     },
     {
       "operatingsystem": "Scientific",
-      "operatingsystemrelease": ["6", "7"]
+      "operatingsystemrelease": [
+        "6",
+        "7"
+      ]
     },
     {
       "operatingsystem": "SLES",
-      "operatingsystemrelease": ["11", "12", "15"]
+      "operatingsystemrelease": [
+        "11",
+        "12",
+        "15"
+      ]
     },
     {
       "operatingsystem": "Debian",
-      "operatingsystemrelease": ["8", "9", "10"]
+      "operatingsystemrelease": [
+        "8",
+        "9",
+        "10"
+      ]
     },
     {
       "operatingsystem": "Ubuntu",
-      "operatingsystemrelease": ["14.04", "16.04", "18.04"]
+      "operatingsystemrelease": [
+        "14.04",
+        "16.04",
+        "18.04"
+      ]
     },
     {
       "operatingsystem": "Solaris",
-      "operatingsystemrelease": ["10", "11"]
+      "operatingsystemrelease": [
+        "10",
+        "11"
+      ]
     },
     {
       "operatingsystem": "Windows",
@@ -55,10 +90,17 @@
     },
     {
       "operatingsystem": "AIX",
-      "operatingsystemrelease": ["5.3", "6.1", "7.1"]
+      "operatingsystemrelease": [
+        "5.3",
+        "6.1",
+        "7.1"
+      ]
     }
   ],
-  "pdk-version": "1.16.0",
-  "template-url": "pdk-default#1.16.0",
-  "template-ref": "tags/1.16.0-0-gaf44904"
+  "requirements": [
+    {
+      "name": "puppet",
+      "version_requirement": ">= 7.24 < 9.0.0"
+    }
+  ]
 }