Skip to content

Commit 5629283

Browse files
committed
fix download artifact to download all, add local debian install
also removed msi install
1 parent db9ee90 commit 5629283

File tree

3 files changed

+18
-34
lines changed

3 files changed

+18
-34
lines changed

.github/workflows/ansible.yml

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -141,31 +141,6 @@ jobs:
141141
name: ${{ matrix.SYS_PACKAGE }}-${{ matrix.ARCH }}-package
142142
path: ./dist/splunk-otel-collector*
143143

144-
msi-build:
145-
runs-on: ubuntu-24.04
146-
steps:
147-
- name: Check out the codebase.
148-
uses: actions/checkout@v4
149-
with:
150-
fetch-depth: 0
151-
152-
- name: Set up Go
153-
uses: actions/setup-go@v5
154-
with:
155-
go-version: ${{ env.GO_VERSION }}
156-
cache-dependency-path: '**/go.sum'
157-
158-
- name: Build MSI
159-
run: |
160-
mkdir -p dist
161-
make msi VERSION=""
162-
163-
- name: Uploading msi build artifacts
164-
uses: actions/upload-artifact@v4
165-
with:
166-
name: msi-build
167-
path: ./dist/*.msi
168-
169144
lint:
170145
name: Lint
171146
runs-on: ubuntu-24.04
@@ -215,8 +190,7 @@ jobs:
215190

216191
- uses: actions/download-artifact@v4
217192
with:
218-
name: .*-package
219-
path: ./dist
193+
path: /tmp
220194

221195
- uses: DamianReeves/[email protected]
222196
with:

deployments/ansible/roles/collector/tasks/apt_install_otel_collector.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@
1313
ansible.builtin.get_url:
1414
url: "{{ splunk_repo_base_url }}/otel-collector-deb/splunk-B3CD4420.gpg"
1515
dest: /etc/apt/trusted.gpg.d/splunk.gpg
16+
when: not install_local_artifact
1617

1718
- name: Add Splunk OpenTelemetry Collector repo to apt source list
1819
ansible.builtin.apt_repository:
1920
repo: "deb {{ splunk_repo_base_url }}/otel-collector-deb release main"
2021
filename: splunk-otel-collector.list
2122
state: present
22-
when: not (splunk_skip_repo | bool)
23+
when: not (splunk_skip_repo | bool) and not install_local_artifact
2324

2425
- name: Install Splunk OpenTelemetry Collector via apt package manager
2526
ansible.builtin.apt:
@@ -31,3 +32,12 @@
3132
notify:
3233
- "restart splunk-otel-collector"
3334
- "restart td-agent"
35+
when: not install_local_artifact
36+
37+
- name: Install Splunk OpenTelemetry Collector via local artifact (arm64)
38+
ansible.builtin.apt:
39+
deb: /tmp/deb-{{ ansible_facts.ansible_architecture }}-package
40+
notify:
41+
- "restart splunk-otel-collector"
42+
- "restart td-agent"
43+
when: install_local_artifact

deployments/ansible/roles/collector/tasks/linux_install.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66
splunk_repo_base_url: https://splunk.jfrog.io/splunk
77
td_agent_repo_base: https://packages.treasuredata.com
88

9-
- name: Install Splunk OpenTelemetry Collector with apt package manager
9+
- name: Install Splunk OpenTelemetry Collector for Debian
1010
ansible.builtin.import_tasks: apt_install_otel_collector.yml
11-
when: ansible_os_family == "Debian" and not install_local_artifact
11+
when: ansible_os_family == "Debian"
1212

13-
- name: Install Splunk OpenTelemetry Collector with yum package manager
13+
- name: Install Splunk OpenTelemetry Collector for RedHat
1414
ansible.builtin.import_tasks: yum_install_otel_collector.yml
15-
when: ansible_os_family == "RedHat" and not install_local_artifact
15+
when: ansible_os_family == "RedHat"
1616

17-
- name: Install Splunk OpenTelemetry Collector with zypper package manager
17+
- name: Install Splunk OpenTelemetry Collector for Suse
1818
ansible.builtin.import_tasks: zypper_install_otel_collector.yml
19-
when: ansible_os_family == "Suse" and not install_local_artifact
19+
when: ansible_os_family == "Suse"
2020

2121
- name: Set Splunk Otel Collector service owner
2222
ansible.builtin.import_tasks: collector_service_owner.yml

0 commit comments

Comments
 (0)