[Git][qa/jenkins.debian.net][master] 3 commits: Revert "reproducible Debian: also export data for unstable to reproducible-tracker.json"

[Mattia Rizzolo (@mattia)]

Mattia Rizzolo pushed to branch master at Debian QA / jenkins.debian.net


Commits:
fe2b114f by Mattia Rizzolo at 2023-09-06T13:06:03+05:30
Revert "reproducible Debian: also export data for unstable to reproducible-tracker.json"

This is creating what pretty much amounts to invalid data structure, as
the generated json coalesce unstable and trixie results into only
"trixie".

This reverts commit ad86258b8406e5186ddd8ffc4aff401cdbfb4cb6.

- - - - -
1c758e08 by Mattia Rizzolo at 2023-09-06T13:06:06+05:30
Revert "reproducible Debian live: disable jobs until openqa credential problem has been fixed"

This has now been fixed

This reverts commit 85533aeabb53fdbacef369c0deaf2aa5a38f6c10.

- - - - -
c7435f7d by Roland Clobus at 2023-09-06T13:06:08+05:30
Instructions for manual configuration of the openQA secrets

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -


3 changed files:

- INSTALL
- bin/reproducible_json.py
- job-cfg/reproducible.yaml


Changes:

=====================================
INSTALL
=====================================
@@ -76,6 +76,14 @@ cd jenkins.debian.net
 
 The configuration of the openQA secrets is done manually. The file `/etc/openqa/client.conf` (on osuosl3) contains the API key for accessing the openQA server.
 
+* In Jenkins, go to 'Dashboard | Credentials | System | Global credentials'
+* Add 2 entries (one for ID=openqa-live-apikey and one for ID=openqa-live-apisecret)
+  * Kind: Secret Text
+  * Scope: Global
+  * Secret: **see client.conf**
+  * ID: openqa-live-apikey
+  * Description: The apikey from /etc/openqa/client.conf on osuosl3
+
 === IRC notification configuration using kgb-client
 
 The jenkins jobs are configured to send email to 'jenkins+$IRC_CHANNEL' (like 'jenkins+debian-qa'), this is parsed by a script ('/srv/jenkins/bin/email2irc.sh') run through 'procmail' which then in turn notifies 'kgb-client', which notfies 'kgb-server'(s) on the internet, which are the bots notifying the IRC channels.


=====================================
bin/reproducible_json.py
=====================================
@@ -49,17 +49,18 @@ crossarchkeys = ['package', 'version', 'suite', 'status']
 archdetailkeys = ['architecture', 'version', 'status', 'build_date']
 
 # crossarch is a dictionary of all packages used to build a summary of the
-# package's test results across all archs and all suites
+# package's test results across all archs (for suite=unstable only)
 crossarch = {}
 
+crossarchversions = {}
 for row in result:
     pkg = dict(zip(keys, row))
     pkg['build_date'] = str(pkg['build_date'])
     log.debug(pkg)
     output.append(pkg)
 
-    # tracker.d.o should only care about results in testing and unstable
-    if pkg['suite'] in ("trixie", "unstable"):
+    # tracker.d.o should only care about results in testing
+    if pkg['suite'] == 'trixie':
 
         if pkg["status"] in ("E404", "NFU", "blacklisted"):
             # don't export these states in reproducible-tracker.json


=====================================
job-cfg/reproducible.yaml
=====================================
@@ -637,7 +637,7 @@
                     my_timed: '30 6 1 * *'
                     my_hname: 'osuosl3'
                 - 'json':
-                    my_description: 'Generate https://reproducible.debian.net/userContent/reproducible.json and https://reproducible.debian.net/userContent/reproducible-tracker.json'
+                    my_description: 'Generate https://reproducible.debian.net/userContent/reproducible.json for consumption by tracker.debian.org.'
                     my_timed: '1 H/2 * * *'
                     my_shellext: ".py"
                 - 'html_alpine':
@@ -978,7 +978,7 @@
     my_recipients: 'qa-jenkins-scm at lists.alioth.debian.org'
     my_node: '{my_hname}'
     my_timeout: '720'
-    my_disabled: true
+    my_disabled: false
     imagetype:
         - "smallest-build"
         - cinnamon



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/58d9c5495ec600a0711dc519a3a297b7304b0a1c...c7435f7d64566acc6be91a66b1806ce87239244f

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/58d9c5495ec600a0711dc519a3a297b7304b0a1c...c7435f7d64566acc6be91a66b1806ce87239244f
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/20230906/8741742d/attachment-0001.htm>