Merge pull request #36 from rh-ecosystem-edge/update-config-files

Update config files

.github/workflows/check-and-build.yaml

@@ -18,6 +18,6 @@ jobs:
           python -m pip install --upgrade pip
           pip install -r scripts/requirements.txt      
       - name: Crawl and build from matrix
-        run: python scripts/check-changes.py
+        run: python scripts/check_changes.py
         env:
           TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/create-matrix.yaml

@@ -19,7 +19,7 @@ jobs:
       - name: Get kernel list
         run: python scripts/kernels.py
       - name: Update matrix file
-        run: python scripts/re-matrix.py
+        run: python scripts/re_matrix.py
       - name: Commit kernel list updates 
         run: |
           git config user.name "github-actions[bot]"

Containerfile

@@ -75,11 +75,11 @@ RUN dnf -y install git git-lfs xz && \
     rm -rf /var/cache/yum
 RUN --mount=type=secret,id=${AUTH_SECRET}/PRIVATE_GITLAB_TOKEN echo "export PRIVATE_GITLAB_TOKEN="$(cat /run/secrets/${AUTH_SECRET}/PRIVATE_GITLAB_TOKEN) >> /tmp/envfile
 RUN source /tmp/envfile && \
-    git clone https://gitlab-ci-token:${PRIVATE_GITLAB_TOKEN}@gitlab.com/ebelarte/artifact-storage.git && \
+    git clone https://gitlab-ci-token:${PRIVATE_GITLAB_TOKEN}@${UPLOAD_ARTIFACT_REPO} && \
     cd artifact-storage && \
     git lfs install && \
     git lfs track "*.tar.xz" && \
-    git remote set-url origin "https://gitlab-ci-token:${PRIVATE_GITLAB_TOKEN}@gitlab.com/ebelarte/artifact-storage.git" && \
+    git remote set-url origin "https://gitlab-ci-token:${PRIVATE_GITLAB_TOKEN}@{UPLOAD_ARTIFACT_REPO}" && \
     git config --global user.email "[email protected]" && \
     git config --global user.name "CI build LFS bot" && \
     tar -cvJf ${DRIVER_VENDOR}-${DRIVER_VERSION}-${KERNEL_VERSION}.tar.xz /opt/drivers && \

argfile.conf

@@ -1,11 +1,14 @@
-DRIVER_REPO=https://github.com/NVIDIA/open-gpu-kernel-modules.git
-DRIVER_VERSION=565.77
-DRIVER_VENDOR=nvidia-opengpu
-ADDITIONAL_BUILD_DEPS=gcc-c++
 DTK_IMAGE=quay.io/redhat-user-workloads/partners-kmod-accel-tenant/pa-driver-toolkit:ee183d162f9f41f83be39c4b362165e0eec8051f
-DRIVER_IMAGE=registry.redhat.io/ubi9/ubi@sha256:b632d0cc6263372a90e9097dcac0a369e456b144a66026b9eac029a22f0f6e07
+ADDITIONAL_BUILD_DEPS=gcc-c++
 SIGNER_SDK_IMAGE=quay.io/redhat-user-workloads/partners-kmod-accel-tenant/klerk:75ad7b90c81b5056b69ff5407a3a2e218d4bbdbc
+DRIVER_IMAGE=registry.redhat.io/ubi9/ubi@sha256:b632d0cc6263372a90e9097dcac0a369e456b144a66026b9eac029a22f0f6e07
+# AWS settings
 AWS_DEFAULT_REGION=us-east-1
 AUTH_SECRET=external-auth-secret
 AWS_KMS_KEY_LABEL=my-test-key
+# Vendor settings
+DRIVER_VER_JSON=https://raw.githubusercontent.com/rh-ecosystem-edge/build-and-sign/refs/heads/main/data/driver-list.json
+DRIVER_REPO=https://github.com/NVIDIA/open-gpu-kernel-modules.git
+DRIVER_VERSION=565.77
+DRIVER_VENDOR=nvidia-opengpu
 UPLOAD_ARTIFACT_REPO=gitlab.com/ebelarte/artifact-storage.git

scripts/check-changes.py → scripts/check_changes.py

@@ -3,7 +3,6 @@
 import requests
 import os
 
-# File paths
 matrix_json_file = "data/combined_output.json"
 argsfile = "argfile.conf"
 token = os.getenv("TOKEN")

scripts/re-matrix.py → scripts/re_matrix.py

@@ -1,9 +1,18 @@
 import json
 import os
 import md5mod
+import urllib.request
+import read_argfile
+
+# Download driver_info_file from argfile.conf
+config = read_argfile.read_key_value_file()
+DRIVER_VER_JSON = config.get("DRIVER_VER_JSON", "Key 'DRIVER_VER_JSON' not found.")
+download_dir = "vendor"
+os.makedirs(download_dir, exist_ok=True)
 
 # Sources for kernel versions and driver versions
-driver_info_file = "data/driver-list.json"
+driver_info_file = read_argfile.download_file(DRIVER_VER_JSON, os.path.join(download_dir, os.path.basename(DRIVER_VER_JSON))) if DRIVER_VER_JSON.startswith("http") else "Invalid URL"
+#driver_info_file = "data/driver-list.json"
 kernel_versions_file = "data/kernel-list.json"
 matrix_file = "data/combined_output.json"
 

scripts/read_argfile.py

@@ -0,0 +1,19 @@
+import os
+import urllib.request
+
+def read_key_value_file(filename="argfile.conf"):
+    data = {}
+    with open(filename, "r") as file:
+        for line in file:
+            line = line.strip()
+            if line and "=" in line:
+                key, value = line.split("=", 1)
+                data[key.strip()] = value.strip()
+    return data
+
+def download_file(url, save_path):
+    try:
+        urllib.request.urlretrieve(url, save_path)
+        return save_path
+    except Exception as e:
+        return f"Error downloading file: {e}"