From b0face2710a91fca4c94da333cbd3d01ead284b1 Mon Sep 17 00:00:00 2001 From: David Mallon Date: Wed, 16 Apr 2025 10:24:02 +0100 Subject: [PATCH 1/3] MAINT test getting module version --- plans/migrate.pp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/plans/migrate.pp b/plans/migrate.pp index 108d18d8..0af312eb 100644 --- a/plans/migrate.pp +++ b/plans/migrate.pp @@ -15,6 +15,13 @@ Optional[String] $upgrade_version = undef, Optional[Peadm::SingleTargetSpec] $replica_host = undef, ) { + # Read and parse metadata.json + $metadata = parsejson(file('./.modules/peadm/metadata.json')) + out::message("peadm module metadata: ${metadata}") + # Get the version value + $module_version = $metadata['version'] + out::message("peadm module version: ${module_version}") + # pre-migration checks out::message('This plan is a work in progress and it is not recommended to be used until it is fully implemented and supported') peadm::assert_supported_bolt_version() From de17a07ec06d7a4388375e5b46d3b55bdc330df6 Mon Sep 17 00:00:00 2001 From: David Mallon Date: Wed, 16 Apr 2025 10:26:55 +0100 Subject: [PATCH 2/3] MAINT test getting module version2 --- plans/migrate.pp | 7 ------- spec/acceptance/peadm_spec/plans/provision_test_cluster.pp | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/plans/migrate.pp b/plans/migrate.pp index 0af312eb..108d18d8 100644 --- a/plans/migrate.pp +++ b/plans/migrate.pp @@ -15,13 +15,6 @@ Optional[String] $upgrade_version = undef, Optional[Peadm::SingleTargetSpec] $replica_host = undef, ) { - # Read and parse metadata.json - $metadata = parsejson(file('./.modules/peadm/metadata.json')) - out::message("peadm module metadata: ${metadata}") - # Get the version value - $module_version = $metadata['version'] - out::message("peadm module version: ${module_version}") - # pre-migration checks out::message('This plan is a work in progress and it is not recommended to be used until it is fully implemented and supported') peadm::assert_supported_bolt_version() diff --git a/spec/acceptance/peadm_spec/plans/provision_test_cluster.pp b/spec/acceptance/peadm_spec/plans/provision_test_cluster.pp index e9b3451a..4b154204 100644 --- a/spec/acceptance/peadm_spec/plans/provision_test_cluster.pp +++ b/spec/acceptance/peadm_spec/plans/provision_test_cluster.pp @@ -3,6 +3,13 @@ $architecture, $image, ) { + # Read and parse metadata.json + $metadata = parsejson(file('./.modules/peadm/metadata.json')) + out::message("peadm module metadata: ${metadata}") + # Get the version value + $module_version = $metadata['version'] + out::message("peadm module version: ${module_version}") + $nodes = case $architecture { 'standard': { From 3a67febf57ffc5441057b9f54957ddf623002a2c Mon Sep 17 00:00:00 2001 From: David Mallon Date: Wed, 16 Apr 2025 11:06:23 +0100 Subject: [PATCH 3/3] MAINT try setting APT_SOURCE --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5b71bfcf..8d82deb5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,6 +4,8 @@ on: pull_request: branches: [main] workflow_dispatch: +env: + APT_SOURCE: "https://artifactory.delivery.puppetlabs.net:443/artifactory" jobs: Spec: if: ${{ github.repository_owner == 'puppetlabs' }}