Skip to content

Commit a8c4bf8

Browse files
committed
Run sbom_generator as sudo
Also, remove dump_repo_metadata role
1 parent 85e48ab commit a8c4bf8

File tree

4 files changed

+2
-41
lines changed

4 files changed

+2
-41
lines changed

.github/actions/shared-steps/action.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -516,10 +516,8 @@ runs:
516516
- name: Generate SBOM
517517
shell: bash
518518
run: |
519-
. ./.venv-sbom/bin/activate
520519
echo "Generating SBOM document of ${{ env.IMAGE_FILE }}"
521-
python3 sbom-tools/sbom_generator.py "${{ env.IMAGE_NAME }}" "${{ env.IMAGE_FILE }}.sbom-data.json" "${{ env.IMAGE_FILE }}.sbom.spdx.json"
522-
done
520+
sudo .venv-sbom/bin/python3 sbom-tools/sbom_generator.py "${{ env.IMAGE_NAME }}" "${{ env.IMAGE_FILE }}.sbom-data.json" "${{ env.IMAGE_FILE }}.sbom.spdx.json"
523521
524522
# - name: Setup tmate session
525523
# uses: mxschmitt/action-tmate@v3
@@ -616,7 +614,7 @@ runs:
616614
path: ${{ env.IMAGE_FILE }}
617615

618616
- uses: actions/upload-artifact@v4
619-
name: Store repo metadata as artifact
617+
name: Store collected sbom data as artifact
620618
id: sbom-data-artifact
621619
if: inputs.store_as_artifact == 'true'
622620
with:

ansible/roles/cleanup_vm/tasks/main.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@
1010
name: sbom_data
1111
when: collect_sbom_data | bool
1212

13-
- name: Include repo metadata dump role (for SBOMs)
14-
include_role:
15-
name: dump_repo_metadata
16-
1713
- name: Find persistent net rules
1814
ansible.builtin.find:
1915
paths: /etc/udev/rules.d

ansible/roles/dump_repo_metadata/files/dump_repo_metadata.py

Lines changed: 0 additions & 15 deletions
This file was deleted.

ansible/roles/dump_repo_metadata/tasks/main.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)