sbom-utility-scripts: upgrade to python3.12

Previously, the container image used python3.9 while tests ran on python(unknown but > 3.9). Upgrade container to python3.12 and set tests to run on 3.12 explicitly. Signed-off-by: Adam Cmiel <[email protected]>
konflux-ci · Dec 10, 2024 · 19e0101 · 19e0101
1 parent 1bf21b1
commit 19e0101
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 1 deletion.
diff --git a/sbom-utility-scripts/Dockerfile b/sbom-utility-scripts/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi9/python-39:1-197.1725907694@sha256:278ae38e8f28ccba3cb7cd542f684d739a84f771e418fc8018d07a522205b05c
+FROM registry.access.redhat.com/ubi9/python-312:9.5@sha256:88ea2d10c741f169681102b46b16c66d20c94c3cc561edbb6444b0de3a1c81b3
 
 WORKDIR /scripts
 

diff --git a/sbom-utility-scripts/scripts/add-image-reference-script/tox.ini b/sbom-utility-scripts/scripts/add-image-reference-script/tox.ini
@@ -2,6 +2,7 @@
 env_list = flake8,black,test
 
 [testenv:test]
+basepython = 3.12
 deps = -r requirements-test.txt
        -r requirements.txt
 commands = pytest ./ \

diff --git a/sbom-utility-scripts/scripts/base-images-sbom-script/app/tox.ini b/sbom-utility-scripts/scripts/base-images-sbom-script/app/tox.ini
@@ -2,6 +2,7 @@
 env_list = flake8,black,test
 
 [testenv:test]
+basepython = 3.12
 deps = -r requirements-test.txt
        -r requirements.txt
 commands = pytest test_base_images_sbom_script.py

diff --git a/sbom-utility-scripts/scripts/index-image-sbom-script/tox.ini b/sbom-utility-scripts/scripts/index-image-sbom-script/tox.ini
@@ -2,6 +2,7 @@
 env_list = flake8,black,test
 
 [testenv:test]
+basepython = 3.12
 deps = -r requirements-test.txt
        -r requirements.txt
 commands = pytest -s -vv test_image_index_sbom_script.py

diff --git a/sbom-utility-scripts/scripts/merge-cachi2-sboms-script/tox.ini b/sbom-utility-scripts/scripts/merge-cachi2-sboms-script/tox.ini
@@ -2,6 +2,7 @@
 env_list = flake8,black,test
 
 [testenv:test]
+basepython = 3.12
 deps = -r requirements-test.txt
 commands = pytest test_merge_cachi2_sboms.py