Skip to content

Commit 0b33710

Browse files
committed
(gh-20) Update gha workflows to use check task
...in place of some of the adhoc shell scripts.
1 parent 5f66955 commit 0b33710

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

.github/workflows/pr_testing.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ jobs:
4646
- name: Run openvox-agent install task
4747
run: bolt task run openvox_bootstrap::install --targets localhost --run-as root
4848
- name: Verify openvox-agent is installed
49-
run: |-
50-
[[ "$(/opt/puppetlabs/bin/puppet --version)" =~ [0-9]+\.[0-9]+\.[0-9]+ ]]
49+
run: bolt task run openvox_bootstrap::check --targets localhost --run-as root
5150
- name: Verify idempotency
5251
run: bolt task run openvox_bootstrap::install --targets localhost --run-as root
5352

@@ -80,7 +79,10 @@ jobs:
8079
PT_collection: openvox8
8180
run: ./openvox_bootstrap/tasks/install_linux.sh
8281
- name: Verify openvox-agent is installed
83-
run: /opt/puppetlabs/bin/puppet --version | grep -E '8\.[0-9]+'
82+
env:
83+
PT_version: '8'
84+
PT_test: 'gt'
85+
run: ./openvox_bootstrap/tasks/check_linux.sh
8486
- name: Verify idempotency
8587
env:
8688
PT_collection: openvox8
@@ -110,7 +112,9 @@ jobs:
110112
PT_version: "8.14.0"
111113
run: ./openvox_bootstrap/tasks/install_linux.sh
112114
- name: Verify openvox-agent is installed
113-
run: /opt/puppetlabs/bin/puppet --version | grep '8.14.0'
115+
env:
116+
PT_version: "8.14.0"
117+
run: ./openvox_bootstrap/tasks/check_linux.sh
114118
- name: Verify idempotency
115119
env:
116120
PT_version: "8.14.0"

.github/workflows/pr_testing_install_build_artifact.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ jobs:
2929
- name: Run openvox-agent install task
3030
run: bolt task run openvox_bootstrap::install_build_artifact version=8.15.0 --targets localhost --run-as root
3131
- name: Verify openvox-agent is installed
32-
run: |-
33-
[[ "$(/opt/puppetlabs/bin/puppet --version)" = "8.15.0" ]]
32+
run: bolt task run openvox_bootstrap::check version=8.15.0 --targets localhost --run-as root
3433
- name: Verify idempotency
3534
run: bolt task run openvox_bootstrap::install_build_artifact version=8.15.0 --targets localhost --run-as root
3635

@@ -64,8 +63,9 @@ jobs:
6463
run: ./openvox_bootstrap/tasks/install_build_artifact_linux.sh
6564
- name: Verify openvox-agent is installed
6665
shell: bash
67-
run: |-
68-
[[ "$(/opt/puppetlabs/bin/puppet --version)" = "8.15.0" ]]
66+
env:
67+
PT_version: "8.15.0"
68+
run: ./openvox_bootstrap/tasks/check_linux.sh
6969
- name: Verify idempotency
7070
env:
7171
PT__installdir: ${{ github.workspace }}

.github/workflows/pr_testing_with_nested_vms.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,4 @@ jobs:
6363
bolt task run openvox_bootstrap::install --inventory kvm_automation_tooling/terraform/instances/inventory.test.yaml --targets test-agent-1
6464
- name: Verify openvox-agent is installed
6565
run: |-
66-
bolt command run \
67-
--inventory kvm_automation_tooling/terraform/instances/inventory.test.yaml --targets test-agent-1 \
68-
'[[ "$(/opt/puppetlabs/bin/puppet --version)" =~ [0-9]+\.[0-9]+\.[0-9]+ ]]'
66+
bolt task run openvox_bootstrap::check version=8 test=gt --inventory kvm_automation_tooling/terraform/instances/inventory.test.yaml --targets test-agent-1

0 commit comments

Comments
 (0)