Skip to content

Commit ab5a4c5

Browse files
committed
remove debugging, clarify comments
1 parent 02b53fe commit ab5a4c5

File tree

2 files changed

+8
-15
lines changed

2 files changed

+8
-15
lines changed

.github/workflows/chef-test.yml

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -293,24 +293,19 @@ jobs:
293293
path: /tmp
294294

295295
# Chef doesn't have an easy way to get names of files from unarchived packages
296-
# It's simpler to unarchive and move the built artifacts manually to the
297-
# cookbook files directory
296+
# It's simpler to manually unarchive and move the built artifacts to the
297+
# cookbook files directory here. The files/ dir under the Chef deployment is a special
298+
# directory in Chef, used for copying files from the cookbook to the host running
299+
# Chef.
298300
# Cookbook files reference: https://docs.chef.io/files/
299301
- name: Extract artifacts
300302
run: |
301-
ls -al /tmp
302-
303-
ls -al /tmp/deb-amd64-package
304-
ls -al /tmp/rpm-amd64-package
305-
306303
mkdir -p files
307304
deb_path=$(find /tmp/deb-amd64-package/splunk-otel-collector*amd64.deb)
308305
mv $deb_path ./files/soc.deb
309306
rpm_path=$(find /tmp/rpm-amd64-package/splunk-otel-collector*x86_64.rpm)
310307
mv $rpm_path ./files/soc.rpm
311308
312-
ls -al ./files
313-
314309
- name: Install chef
315310
uses: actionshub/[email protected]
316311
with:
@@ -349,19 +344,17 @@ jobs:
349344

350345
# Chef doesn't have an easy way to get names of files from unarchived packages
351346
# It's simpler to unarchive and move the built artifacts manually to the
352-
# cookbook files directory
347+
# cookbook files directory. The files/ dir under the Chef deployment is a special
348+
# directory in Chef, used for copying files from the cookbook to the host running
349+
# Chef.
353350
# Cookbook files reference: https://docs.chef.io/files/
354351
- name: Extract artifacts
355352
run: |
356-
ls /tmp
357-
358353
mkdir files
359354
Get-ChildItem /tmp -Recurse -Include 'splunk-otel-collector*.msi' | Select FullName -OutVariable msiPath
360355
echo $msiPath.FullName
361356
mv $msiPath.FullName ./files/splunk-otel-collector.msi
362357
363-
ls ./files
364-
365358
- name: Install chef
366359
uses: actionshub/[email protected]
367360
with:

deployments/chef/recipes/default.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
include_recipe 'splunk_otel_collector::collector_zypper_repo'
5656
end
5757

58-
# Packages should already be installed for local artifact testing
58+
# splunk-otel-collector package should already be installed for local artifact testing
5959
unless node['splunk_otel_collector']['local_artifact_testing_enabled']
6060
package 'splunk-otel-collector' do
6161
action :install

0 commit comments

Comments
 (0)