Test change only: Docker image and u_packages.yml update. (#1112)

The Docker image is updated to install ppp for Linux, needed for the up-coming addition of support for PPP connectivity via cellular on Linux. In updating the Docker image it seems that Segger have removed the version of their JLInk tools that we were using (i.e. 7.88n has gone from their website), so we also switch to the latest named version of their tools (7.94m). Since a new version of PyLint is brought in by this with some new recommendations there are associated Python script updates.
u-blox · Mar 7, 2024 · 3806278 · 3806278
1 parent b747695
commit 3806278
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/port/platform/common/automation/docker/builder/Dockerfile b/port/platform/common/automation/docker/builder/Dockerfile
@@ -91,13 +91,13 @@ RUN apt-get update && apt-get install -y wget &&
 # apt-get needs this to allow it to create temporary files
     chmod 1777 /tmp &&                                                              \
     if [ "$(arch)" != "aarch64" ]; then                                             \
-        wget -q --post-data="accept_license_agreement=accepted" -P /tmp https://www.segger.com/downloads/jlink/JLink_Linux_V788b_x86_64.deb && \
+        wget -q --post-data="accept_license_agreement=accepted" -P /tmp https://www.segger.com/downloads/jlink/JLink_Linux_V794m_x86_64.deb && \
 # use dpkg to unpack the .deb file, but don't configure quite yet
-        dpkg --unpack /tmp/JLink_Linux_V788b_x86_64.deb;                            \
+        dpkg --unpack /tmp/JLink_Linux_V794m_x86_64.deb;                            \
     else                                                                            \
-        wget -q --post-data="accept_license_agreement=accepted" -P /tmp https://www.segger.com/downloads/jlink/JLink_Linux_V788b_arm64.deb && \
+        wget -q --post-data="accept_license_agreement=accepted" -P /tmp https://www.segger.com/downloads/jlink/JLink_Linux_V794m_arm64.deb && \
 # use dpkg to unpack the .deb file, but don't configure quite yet.
-        dpkg --unpack /tmp/JLink_Linux_V788b_arm64.deb;                             \
+        dpkg --unpack /tmp/JLink_Linux_V794m_arm64.deb;                             \
     fi &&                                                                           \
 # the JLink installer includes a post-install step that will fail 'cos this is Docker
 # and udevadm stuff doesn't really work; we fix that by deleting the post install step
@@ -148,7 +148,7 @@ WORKDIR /workdir
 RUN chmod 1777 /tmp && \
     pip3 install pyserial pylint psutil pylink-square requests_toolbelt rpyc debugpy invoke==2.0.0 coloredlogs verboselogs && \
     apt-get update && apt-get install -y --no-install-recommends  \
-        usbutils gawk iputils-ping openssh-client socat \
+        usbutils gawk iputils-ping openssh-client socat ppp \
 # Needed for OpenOCD
         libhidapi-hidraw0 && \
 # Cleanup

diff --git a/port/platform/common/automation/scripts/u_run_pylint.py b/port/platform/common/automation/scripts/u_run_pylint.py
@@ -113,17 +113,17 @@ def run(ubxlib_dir, reporter):
                                     if rating < MIN_RATING:
                                         reporter.event(u_report.EVENT_TYPE_CHECK,
                                                        u_report.EVENT_ERROR,
-                                                       "rating {} < minimum ({})".  \
-                                                       format(rating, MIN_RATING))
+                                                       f"rating {rating} <"      \
+                                                       f" minimum ({MIN_RATING})")
                                         for line in text.splitlines():
                                             line = line.strip().decode()
                                             if line:
                                                 reporter.event_extra_information(line)
                                 else:
                                     reporter.event(u_report.EVENT_TYPE_INFRASTRUCTURE,
                                                    u_report.EVENT_FAILED,
-                                                   "Pylint returned no rating for file \"{}\"". \
-                                                   format(py_file))
+                                                   "Pylint returned no rating for" \
+                                                   f" file \"{py_file}\"")
                                     U_LOG.info("Pylint returned no rating.")
                                     # No rating returned, flag an error
                                     return_value += 1

diff --git a/port/platform/common/automation/u_packages.yml b/port/platform/common/automation/u_packages.yml
@@ -61,17 +61,17 @@ nrf_cli:
 segger_jlink:
     type: segger_jlink
     windows:
-        url: https://www.segger.com/downloads/jlink/JLink_Windows_V788b_x86_64.exe
-        package_name: JLink_Windows_V788b_x86_64.exe
+        url: https://www.segger.com/downloads/jlink/JLink_Windows_V794m_x86_64.exe
+        package_name: JLink_Windows_V794m_x86_64.exe
         add_to_path: "%homedrive%\\Program Files\\SEGGER\\JLink"
         check_command: cmd /c "if exist %homedrive%\\Program Files\\SEGGER\\JLink\\JLink.exe else where jlink /Q"
     linux:
-        url: https://www.segger.com/downloads/jlink/JLink_Linux_V788b_x86_64.deb
-        package_name: JLink_Linux_V788b_x86_64.deb
+        url: https://www.segger.com/downloads/jlink/JLink_Linux_V794m_x86_64.deb
+        package_name: JLink_Linux_V794m_x86_64.deb
         check_command: which JLinkExe
     linux_arm:
-        url: https://www.segger.com/downloads/jlink/JLink_Linux_V788b_arm64.deb
-        package_name: JLink_Linux_V788b_arm64.deb
+        url: https://www.segger.com/downloads/jlink/JLink_Linux_V794m_arm64.deb
+        package_name: JLink_Linux_V794m_arm64.deb
         check_command: which JLinkExe
 
 stm32cubef4: