.gitlab-ci.yml

@@ -70,16 +70,10 @@ script_limit:
         --key before_script
         --key after_script
 
-# FIXME: Find out how to correctly use sourcery with its new open source plan. According
-# to the documentation, the login step should be obsolete. Sourcery complains, however,
-# that our code is closed-source, which is not true.
-# See https://docs.sourcery.ai/Guides/Getting-Started/Command-Line/
-# sourcery:
-#   extends: .analyze
-#   script:
-#     - cd scripts
-#     - sourcery login --token $SOURCERY_TOKEN
-#     - sourcery review --check --verbose *.py
+sourcery:
+  extends: .analyze
+  script:
+    - sourcery review --check --verbose scripts/*.py
 
 yamllint:
   extends: .analyze

build-pipeline-ci-test.yml

@@ -42,6 +42,7 @@ build:files:
   before_script:
     - !reference [.docker_check]
     - !reference [.setup_ssh]
+    - !reference [.setup_git_credentials]
     - !reference [.repo_checkout]
   script:
     - *build
@@ -73,6 +74,7 @@ build:check-foo-branch:
   before_script:
     - !reference [.docker_check]
     - !reference [.setup_ssh]
+    - !reference [.setup_git_credentials]
     - !reference [.repo_checkout]
   script: |
     echo "repo branch: $MASTER_BRANCH"

build-pipeline-yocto.yml.jinja2

@@ -85,6 +85,8 @@ build-{{ machine }}:
     - export SUPPORTED_HARDWARE="     SANTARO,     SANTOKA,     SANTINO,     SANTINO LT,     SANTVEND, "
 {%- elif machine == "seco-mx8mm" %}
     - export SUPPORTED_HARDWARE="     TANARO, "
+{%- elif machine == "seco-mx93" %}
+    - export SUPPORTED_HARDWARE="     MAURY, "
 {%- elif machine == "seco-genio700" %}
     - export SUPPORTED_HARDWARE="     WILK, "
 {%- endif %}
@@ -101,6 +103,10 @@ build-{{ machine }}:
 # Run platform tests for this machine which the yocto image
 # This is a little hacky as we need to match the machine name to
 # the available platforms
+# 
+# @TODO: We don't have devices for the i.MX93 and Genio 700 in
+# LAVA yet. Enable the tests here, when the new devices have
+# been added.
 {% for machine in MACHINES.split(' ') %}
 
 {% if machine == 'seco-mx6' or machine == 'imx6guf' %}
@@ -109,12 +115,15 @@ build-{{ machine }}:
 {% elif machine == 'seco-mx6ull' or machine == 'imx6ullguf' %}
   {% set platforms = "nallino" %}
   {% set lava_machine = "imx6ullguf" %}
-{% elif machine == 'seco-mx8mm' or machine == 'imx8mguf'  %}
+{% elif machine == 'seco-mx8mm' or machine == 'imx8mguf' %}
   {% set platforms = "tanaro" %}
   {% set lava_machine = "imx8mguf" %}
-{% elif machine == 'seco-genio700' %}
-  {% set platforms = "wilk" %}
-  {% set lava_machine = "genio700" %}
+#{% elif machine == 'seco-mx93' %}
+#  {% set platforms = "maury" %}
+#  {% set lava_machine = "mx93" %}
+#{% elif machine == 'seco-genio700' %}
+#  {% set platforms = "wilk" %}
+#  {% set lava_machine = "genio700" %}
 {% else %}
   {% set platforms = '' %}
   {% set lava_machine = '' %}

build-pipeline.yml

@@ -45,6 +45,28 @@ workflow:
   # Write SSH configuration from variable to config file
   - echo "$SSH_CONFIG" > ~/.ssh/config
 
+.setup_git_credentials: &setup_git_credentials
+  - echo "Setup Git Credentials Cache"
+  - git config --global credential.helper 'cache --timeout 86400'
+  - while read -r credentials; do
+      TOKEN_PATH=$(echo $credentials | cut -d':' -f1);
+      USERNAME=$(echo $credentials | cut -d':' -f2);
+      TOKEN=$(echo $credentials | cut -d':' -f3);
+
+      if [ -z "${USERNAME}" ] || [ -z "${TOKEN}" ]; then
+        echo "Invalid Git Credentials entry; Skipping ...";
+        continue;
+      fi
+
+      echo "protocol=https\n"
+           "host=git.seco.com\n"
+           "path=${TOKEN_PATH}\n"
+           "username=${USERNAME}\n"
+           "password=${TOKEN}\n" |
+           git credential approve
+      ;
+    done <<< "${GITLAB_PRIVATE_TOKEN}"
+
 .repo_checkout: &repo_checkout
   - echo "Perform repo checkout"
   - cd ${CI_PROJECT_DIR}
@@ -246,6 +268,7 @@ workflow:
   before_script:
     - *docker_check
     - *setup_ssh
+    - *setup_git_credentials
     - *repo_checkout
     - *setup_build
   script:
@@ -320,6 +343,7 @@ workflow:
       junit: results/results-*.xml
   before_script:
     - !reference [.setup_ssh]
+    - !reference [.setup_git_credentials]
   script:
     - .gitlab-ci/scripts/download_file_from_latest_job.py
         --project $CI_PROJECT_ID

scripts/generate_firmware_package.py

@@ -25,10 +25,7 @@ def generate_entry(
 ):
     """Create a JSON object for a new firmware package entry"""
 
-    package_entry = {}
-
-    package_entry["name"] = name
-    package_entry["type"] = _type
+    package_entry = {"name": name, "type": _type}
 
     if description:
         package_entry["description"] = description
@@ -112,6 +109,8 @@ def generate_firmware_package(
     sbom = []
     sbom_packages = []
 
+    sbom_files = []
+
     if "fngsystem".casefold() in release_name.casefold():
         # Flash-N-Go System
         file_types = [
@@ -121,8 +120,6 @@ def generate_firmware_package(
             FirmwarePackageKeys.FNGSYS_CHECKSUM,
         ]
 
-        sbom_files = []
-
         for file_type in file_types:
             sbom_files.append(
                 generate_subpackage(
@@ -174,8 +171,6 @@ def generate_firmware_package(
             FirmwarePackageKeys.YOCTO_FS,
         ]
 
-        sbom_files = []
-
         for file_type in file_types:
             sbom_files.append(
                 generate_subpackage(
@@ -254,11 +249,7 @@ def main():
         sys.exit("ERROR: --output-file must at least contain a valid filename")
 
     # Parse/read file list
-    files = []
-
-    if args.files:
-        files = args.files.split()
-
+    files = args.files.split() if args.files else []
     if args.files_list:
         for files_file in glob.glob(args.files_list, recursive=True):
             print(f"Reading files from {files_file}")