[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible OpenWrt: drop deprecated ar71xx job (replaced by ath79)

[Holger Levsen (@holger)]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
1a50b33d by Holger Levsen at 2021-07-11T17:26:42+02:00
reproducible OpenWrt: drop deprecated ar71xx job (replaced by ath79)

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


3 changed files:

- bin/common-functions.sh
- bin/reproducible_openwrt.sh
- job-cfg/reproducible.yaml


Changes:

=====================================
bin/common-functions.sh
=====================================
@@ -219,7 +219,7 @@ jenkins_zombie_check() {
 	# and we dont know why and when that happens,
 	# so just report those zombies here.
 	#
-	ZOMBIES="$(ls -1d /var/lib/jenkins/jobs/* | egrep 'strip-nondeterminism|reprotest|reproducible_(builder_(amd64|i386|armhf|arm64)|setup_(pbuilder|schroot)_testing)|chroot-installation_wheezy|aptdpkg|stretch_install_education-thin-client-server|jessie_multiarch_versionskew|dpkg_stretch_find_trigger_cycles|sid_install_education-services|buster_install_education-services|lvc|chroot-installation_stretch_.*_upgrade_to_sid|chroot-installation_buster_.*_upgrade_to_sid|piuparts_.*_jessie|udd_stretch|d-i_pu-build|debsums-tests_stretch|debian-archive-keyring-tests_stretch|chroot-installation_jessie|chroot-installation_.*education-lang-|kirkwoot|rebootstrap_.*_gcc[5-8]($|_)|brcm47xx|rebootstrap_kfreebsd|diffoscope_from_git_|disorderfs_from_git_master|diffoscope_pypi|diffoscope_freebsd|diffoscope_netbsd|diffoscope_macports|diffoscope_archlinux|openwrt-target-ath97|profitbricks|pool_buildinfos_suites|^g-i|reproducible_compare_Debian_sha1sums|bbx15|cb3a|ff2a|ff2b|jtk1a|jtk1b|odxu4a|odxu4b|odu3a|opi2a|opi2c|p64b|p64c' || true)"
+	ZOMBIES="$(ls -1d /var/lib/jenkins/jobs/* | egrep 'strip-nondeterminism|reprotest|reproducible_(builder_(amd64|i386|armhf|arm64)|setup_(pbuilder|schroot)_testing)|chroot-installation_wheezy|aptdpkg|stretch_install_education-thin-client-server|jessie_multiarch_versionskew|dpkg_stretch_find_trigger_cycles|sid_install_education-services|buster_install_education-services|lvc|chroot-installation_stretch_.*_upgrade_to_sid|chroot-installation_buster_.*_upgrade_to_sid|piuparts_.*_jessie|udd_stretch|d-i_pu-build|debsums-tests_stretch|debian-archive-keyring-tests_stretch|chroot-installation_jessie|chroot-installation_.*education-lang-|kirkwoot|rebootstrap_.*_gcc[5-8]($|_)|brcm47xx|rebootstrap_kfreebsd|diffoscope_from_git_|disorderfs_from_git_master|diffoscope_pypi|diffoscope_freebsd|diffoscope_netbsd|diffoscope_macports|diffoscope_archlinux|openwrt-target-ath97|profitbricks|pool_buildinfos_suites|^g-i|reproducible_compare_Debian_sha1sums|bbx15|cb3a|ff2a|ff2b|jtk1a|jtk1b|odxu4a|odxu4b|odu3a|opi2a|opi2c|p64b|p64c|ar71xx' || true)"
 	if [ ! -z "$ZOMBIES" ] ; then
 		DIRTY=true
 		figlet 'zombies!!!'


=====================================
bin/reproducible_openwrt.sh
=====================================
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2014-2020 Holger Levsen <holger at layer-acht.org>
+# Copyright 2014-2021 Holger Levsen <holger at layer-acht.org>
 #         © 2015 Reiner Herrmann <reiner at reiner-h.de>
 #           2016-2018 Alexander Couzens <lynxis at fe80.eu>
 # released under the GPLv2
@@ -253,7 +253,7 @@ openwrt_build_toolchain() {
 }
 
 # RUN - b1 or b2. b1 means first run, b2 second
-# TARGET - a target including subtarget. E.g. ar71xx_generic
+# TARGET - a target including subtarget. E.g. ath79_generic
 openwrt_compile() {
 	local RUN=$1
 	local TARGET=$2
@@ -366,7 +366,7 @@ openwrt_strip_metadata_signature() {
 
 # openwrt_build is run on a remote host
 # RUN - b1 or b2. b1 means first run, b2 second
-# TARGET - a target including subtarget. E.g. ar71xx_generic
+# TARGET - a target including subtarget. E.g. ath79_generic
 # CONFIG - a simple basic .config as string. Use \n to seperate lines
 # TMPPATH - is a unique path generated with mktmp
 openwrt_build() {
@@ -396,8 +396,7 @@ openwrt_build() {
 }
 
 # build openwrt/openwrt on two different hosts
-# TARGET a target including subtarget. E.g. ar71xx_generic
-# CONFIG - a simple basic .config as string. Use \n to seperate lines
+# TARGET a target including subtarget. E.g. aththththththth79- a simple basic .config as string. Use \n to seperate lines
 build_two_times() {
 	local TARGET=$1
 	local CONFIG=$2
@@ -704,7 +703,7 @@ write_openwrt_page_header
 write_page_intro OpenWrt
 write_page "     <p>"
 write_page "     <ul>"
-for i in ath79 ar71xx bcm47xx kirkwood lantiq mediatek omap ramips sunxi tegra x86 ; do
+for i in ar71xx bcm47xx kirkwood lantiq mediatek omap ramips sunxi tegra x86 ; do
 	write_page "            <li><a href="openwrt_$i.html">$i</a></li>"
 done
 write_page "     </ul>"


=====================================
job-cfg/reproducible.yaml
=====================================
@@ -634,10 +634,6 @@
                     my_timed: '23 3 * * 2,4,6'
                     my_openwrt_config: 'CONFIG_TARGET_ath79=y'
                     my_openwrt_target: 'ath79'
-                - 'openwrt-target-ar71xx':
-                    my_timed: '42 23 * * 1,3,5'
-                    my_openwrt_config: 'CONFIG_TARGET_ar71xx=y'
-                    my_openwrt_target: 'ar71xx'
                 - 'openwrt-target-ramips':
                     my_timed: '42 23 * * 2,4,6'
                     my_openwrt_config: 'CONFIG_TARGET_ramips=y'



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/1a50b33d94f06d2c9572bf75b6dd145545f00d7b

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/1a50b33d94f06d2c9572bf75b6dd145545f00d7b
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20210711/124f9e92/attachment-0001.htm>