From a2150a0f567893facda4ec844ed2acd08c7886e3 Mon Sep 17 00:00:00 2001 From: Valentine Burley Date: Mon, 7 Apr 2025 16:24:56 +0200 Subject: [PATCH] ci/baremetal: Remove legacy support for unused devices Clean up unused remnants for old devices that are no longer used. Signed-off-by: Valentine Burley Part-of: --- .gitlab-ci/bare-metal/cisco-2960-poe-off.sh | 17 -------- .gitlab-ci/bare-metal/cisco-2960-poe-on.sh | 22 ---------- .gitlab-ci/bare-metal/poe-powered.sh | 27 ------------ .gitlab-ci/bare-metal/telnet-buffer.py | 41 ------------------- .gitlab-ci/container/baremetal_build.sh | 19 --------- .../container/debian/baremetal_arm_test.sh | 12 ------ 6 files changed, 138 deletions(-) delete mode 100755 .gitlab-ci/bare-metal/cisco-2960-poe-off.sh delete mode 100755 .gitlab-ci/bare-metal/cisco-2960-poe-on.sh delete mode 100755 .gitlab-ci/bare-metal/telnet-buffer.py diff --git a/.gitlab-ci/bare-metal/cisco-2960-poe-off.sh b/.gitlab-ci/bare-metal/cisco-2960-poe-off.sh deleted file mode 100755 index fdc52d3c43a..00000000000 --- a/.gitlab-ci/bare-metal/cisco-2960-poe-off.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -# shellcheck disable=SC2086 # we want word splitting - -if [ -z "$BM_POE_INTERFACE" ]; then - echo "Must supply the PoE Interface to power down" - exit 1 -fi - -if [ -z "$BM_POE_ADDRESS" ]; then - echo "Must supply the PoE Switch host" - exit 1 -fi - -SNMP_KEY="1.3.6.1.4.1.9.9.402.1.2.1.1.1.$BM_POE_INTERFACE" -SNMP_OFF="i 4" - -snmpset -v2c -r 3 -t 30 -cmesaci "$BM_POE_ADDRESS" "$SNMP_KEY" $SNMP_OFF diff --git a/.gitlab-ci/bare-metal/cisco-2960-poe-on.sh b/.gitlab-ci/bare-metal/cisco-2960-poe-on.sh deleted file mode 100755 index 1f80ab37889..00000000000 --- a/.gitlab-ci/bare-metal/cisco-2960-poe-on.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -# shellcheck disable=SC2086 # we want word splitting - -if [ -z "$BM_POE_INTERFACE" ]; then - echo "Must supply the PoE Interface to power up" - exit 1 -fi - -if [ -z "$BM_POE_ADDRESS" ]; then - echo "Must supply the PoE Switch host" - exit 1 -fi - -set -ex - -SNMP_KEY="1.3.6.1.4.1.9.9.402.1.2.1.1.1.$BM_POE_INTERFACE" -SNMP_ON="i 1" -SNMP_OFF="i 4" - -snmpset -v2c -r 3 -t 10 -cmesaci "$BM_POE_ADDRESS" "$SNMP_KEY" $SNMP_OFF -sleep 3s -snmpset -v2c -r 3 -t 10 -cmesaci "$BM_POE_ADDRESS" "$SNMP_KEY" $SNMP_ON diff --git a/.gitlab-ci/bare-metal/poe-powered.sh b/.gitlab-ci/bare-metal/poe-powered.sh index 3be933ef855..26f716c74eb 100755 --- a/.gitlab-ci/bare-metal/poe-powered.sh +++ b/.gitlab-ci/bare-metal/poe-powered.sh @@ -144,33 +144,6 @@ fi date +'%F %T' -# Set up the pxelinux config for Jetson Nano -mkdir -p /tftp/pxelinux.cfg -cat </tftp/pxelinux.cfg/default-arm-tegra210-p3450-0000 -PROMPT 0 -TIMEOUT 30 -DEFAULT primary -MENU TITLE jetson nano boot options -LABEL primary - MENU LABEL CI kernel on TFTP - LINUX Image - FDT tegra210-p3450-0000.dtb - APPEND \${cbootargs} $BM_CMDLINE -EOF - -# Set up the pxelinux config for Jetson TK1 -cat </tftp/pxelinux.cfg/default-arm-tegra124-jetson-tk1 -PROMPT 0 -TIMEOUT 30 -DEFAULT primary -MENU TITLE jetson TK1 boot options -LABEL primary - MENU LABEL CI kernel on TFTP - LINUX zImage - FDT tegra124-jetson-tk1.dtb - APPEND \${cbootargs} $BM_CMDLINE -EOF - # Create the rootfs in the NFS directory . $BM/rootfs-setup.sh /nfs diff --git a/.gitlab-ci/bare-metal/telnet-buffer.py b/.gitlab-ci/bare-metal/telnet-buffer.py deleted file mode 100755 index 408243a0109..00000000000 --- a/.gitlab-ci/bare-metal/telnet-buffer.py +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/python3 - -# Copyright © 2020 Christian Gmeiner -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -# IN THE SOFTWARE. -# -# Tiny script to read bytes from telnet, and write the output to stdout, with a -# buffer in between so we don't lose serial output from its buffer. -# - -import sys -import telnetlib - -host = sys.argv[1] -port = sys.argv[2] - -tn = telnetlib.Telnet(host, port, 1000000) - -while True: - bytes = tn.read_some() - sys.stdout.buffer.write(bytes) - sys.stdout.flush() - -tn.close() diff --git a/.gitlab-ci/container/baremetal_build.sh b/.gitlab-ci/container/baremetal_build.sh index 9fed2539ce0..f78ddfaf401 100644 --- a/.gitlab-ci/container/baremetal_build.sh +++ b/.gitlab-ci/container/baremetal_build.sh @@ -33,30 +33,11 @@ if [[ $arch == "arm64" ]]; then DEVICE_TREES="" DEVICE_TREES="$DEVICE_TREES apq8016-sbc-usb-host.dtb" DEVICE_TREES="$DEVICE_TREES apq8096-db820c.dtb" - DEVICE_TREES="$DEVICE_TREES tegra210-p3450-0000.dtb" - DEVICE_TREES="$DEVICE_TREES imx8mq-nitrogen.dtb" for DTB in $DEVICE_TREES; do curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \ -O "${KERNEL_IMAGE_BASE}/arm64/$DTB" done - popd -elif [[ $arch == "armhf" ]]; then - mkdir -p /baremetal-files - pushd /baremetal-files - - curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \ - -O "${KERNEL_IMAGE_BASE}"/armhf/zImage - - DEVICE_TREES="" - DEVICE_TREES="$DEVICE_TREES imx6q-cubox-i.dtb" - DEVICE_TREES="$DEVICE_TREES tegra124-jetson-tk1.dtb" - - for DTB in $DEVICE_TREES; do - curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \ - -O "${KERNEL_IMAGE_BASE}/armhf/$DTB" - done - popd fi diff --git a/.gitlab-ci/container/debian/baremetal_arm_test.sh b/.gitlab-ci/container/debian/baremetal_arm_test.sh index 3849dd52404..45dec46319b 100644 --- a/.gitlab-ci/container/debian/baremetal_arm_test.sh +++ b/.gitlab-ci/container/debian/baremetal_arm_test.sh @@ -42,15 +42,3 @@ curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \ -o /usr/share/snmp/mibs/SNMPv2-SMI.txt . .gitlab-ci/container/baremetal_build.sh - -mkdir -p /baremetal-files/jetson-nano/boot/ -ln -s \ - /baremetal-files/Image \ - /baremetal-files/tegra210-p3450-0000.dtb \ - /baremetal-files/jetson-nano/boot/ - -mkdir -p /baremetal-files/jetson-tk1/boot/ -ln -s \ - /baremetal-files/zImage \ - /baremetal-files/tegra124-jetson-tk1.dtb \ - /baremetal-files/jetson-tk1/boot/