[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: reproducible Archlinux: drop the remaining temp. code

[Holger Levsen]

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


Commits:
de512ba6 by Holger Levsen at 2018-09-24T14:24:31Z
reproducible Archlinux: drop the remaining temp. code

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

- - - - -
c110f366 by Holger Levsen at 2018-09-24T14:35:32Z
reproducible Archlinux scheduler: fix two typos

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

- - - - -


2 changed files:

- TODO
- bin/reproducible_archlinux_scheduler.sh


Changes:

=====================================
TODO
=====================================
@@ -330,11 +330,9 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian
 *** we share /var/log/jenkins/reproducible-race-conditions.log with debian, is that ok? (else fix maintenance job and handle_race_condition())
 *** make build respect pacman exit code, see FIXME in _html_.sh
 ** html
-*** disable (and then drop) all current html creation
-*** leave all files, delete them (much) later
+*** leave all pkg.html files, delete them (much) later, then check all pkg.* files are gone
 *** recreate them newly as index.html
 **** create new job to recreate all pkg pages
-**** call pkg html function after each build
 *** create index pages
 *** create new archlinux.html - keep the old one til this works
 ** create json


=====================================
bin/reproducible_archlinux_scheduler.sh
=====================================
@@ -69,17 +69,6 @@ update_archlinux_repositories() {
 					# from results
 					# from scheduled
 					# from sources
-				else
-					#
-					# temporary code to move archlinux results from fs to db
-					#
-					cd $BASE/archlinux/$REPO/$PKG
-					if [ -f pkg.build_duration ] && [ -f pkg.state ] && [ -f pkg.version ] ; then
-						SUITE="archlinux_$REPO"
-						rm pkg.build_duration pkg.state pkg.version
-					elif [ -f pkg.build_duration ] || [ -f pkg.state ] || [ -f pkg.version ] ; then
-						echo "$REPO/$PKG: one or more of pkg.build_duration, pkg.state and pkg.version does not exist, ignoring."
-					fi
 				fi
 			done
 		done
@@ -121,13 +110,13 @@ update_archlinux_repositories() {
 							echo "$PKG is blacklisted, so not scheduling it."
 						else
 							PKG_ID=$(query_db "SELECT id FROM sources WHERE name='$PKG' AND suite='$SUITE' AND architecture='$ARCH';")
-							echo " SELECT FROM schedule WHERE package_id = '${PKG_ID}';"
-							SCHEDULED=$(query_db "SELECT FROM schedule WHERE package_id = '${PKG_ID}';")
+							echo " SELECT * FROM schedule WHERE package_id = '${PKG_ID}';"
+							SCHEDULED=$(query_db "SELECT * FROM schedule WHERE package_id = '${PKG_ID}';")
 							if [ -z "$SCHEDULED" ] ; then
 								echo " INSERT INTO schedule (package_id, date_scheduled) VALUES ('${PKG_ID}', '$DATE');"
 								query_db "INSERT INTO schedule (package_id, date_scheduled) VALUES ('${PKG_ID}', '$DATE');" ||true
 							else
-								" $PKG (package_id: ${PKG_ID}) already scheduled, not scheduling again."
+								echo " $PKG (package_id: ${PKG_ID}) already scheduled, not scheduling again."
 							fi
 						fi
 					elif [ "$VERCMP" = "-1" ] ; then



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/03aaaf9ea5fc85f7ee29f28854a96ea8f0107ea8...c110f366bbaeb1b24d172af4f22e1c8aed4cc25a

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/03aaaf9ea5fc85f7ee29f28854a96ea8f0107ea8...c110f366bbaeb1b24d172af4f22e1c8aed4cc25a
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/20180924/145c69d1/attachment-0001.html>