Ansgar pushed to branch deploy at Debian FTP Team / dak
Commits:
-
cd837cdf
by Thomas Vincent at 2021-02-22T21:24:49+00:00
-
1841ac86
by Ansgar at 2021-02-25T10:30:00+01:00
-
d0ae6d16
by Ansgar at 2021-02-25T10:54:45+01:00
-
050b860b
by Ansgar at 2021-02-25T10:55:02+01:00
3 changed files:
- config/homedir/ssh/ftpmaster-config
- daklib/externalsignature.py
- integration-tests/tests/1000-external-signatures
Changes:
| ... | ... | @@ -17,7 +17,7 @@ Host bugs-sync |
| 17 | 17 |
|
| 18 | 18 |
Host ddtp-sync
|
| 19 | 19 |
Hostname ddtp.debian.org
|
| 20 |
- User ddtp-dak
|
|
| 20 |
+ User ddtp
|
|
| 21 | 21 |
IdentityFile /srv/ftp-master.debian.org/s3kr1t/ddtp-dak.rsa
|
| 22 | 22 |
|
| 23 | 23 |
Host dep11-sync
|
| ... | ... | @@ -33,22 +33,24 @@ def export_external_signature_requests(session, path): |
| 33 | 33 |
tbl_arch = DBConn().tbl_architecture
|
| 34 | 34 |
tbl_ba = DBConn().tbl_bin_associations
|
| 35 | 35 |
tbl_bin = DBConn().tbl_binaries
|
| 36 |
+ tbl_src = DBConn().tbl_source
|
|
| 36 | 37 |
tbl_esr = DBConn().tbl_external_signature_requests
|
| 37 | 38 |
tbl_suite = DBConn().tbl_suite
|
| 38 | 39 |
|
| 39 |
- query = sql.select([tbl_bin.c.package, tbl_suite.c.suite_name, tbl_suite.c.codename, tbl_arch.c.arch_string, sql.func.max(tbl_bin.c.version)]) \
|
|
| 40 |
- .select_from(tbl_esr.join(tbl_suite).join(tbl_ba, tbl_ba.c.id == tbl_esr.c.association_id).join(tbl_bin).join(tbl_arch)) \
|
|
| 41 |
- .group_by(tbl_bin.c.package, tbl_suite.c.suite_name, tbl_suite.c.codename, tbl_arch.c.arch_string)
|
|
| 40 |
+ query = sql.select([tbl_bin.c.package, tbl_src.c.source, tbl_suite.c.suite_name, tbl_suite.c.codename, tbl_arch.c.arch_string, sql.func.max(tbl_bin.c.version)]) \
|
|
| 41 |
+ .select_from(tbl_esr.join(tbl_suite).join(tbl_ba, tbl_ba.c.id == tbl_esr.c.association_id).join(tbl_bin).join(tbl_arch).join(tbl_src, tbl_bin.c.source == tbl_src.c.id)) \
|
|
| 42 |
+ .group_by(tbl_bin.c.package, tbl_src.c.source, tbl_suite.c.suite_name, tbl_suite.c.codename, tbl_arch.c.arch_string)
|
|
| 42 | 43 |
requests = session.execute(query)
|
| 43 | 44 |
|
| 44 | 45 |
data = {
|
| 45 | 46 |
'packages': [
|
| 46 | 47 |
{
|
| 47 | 48 |
'package': row[0],
|
| 48 |
- 'suite': row[1],
|
|
| 49 |
- 'codename': row[2],
|
|
| 50 |
- 'architecture': row[3],
|
|
| 51 |
- 'version': row[4],
|
|
| 49 |
+ 'source': row[1],
|
|
| 50 |
+ 'suite': row[2],
|
|
| 51 |
+ 'codename': row[3],
|
|
| 52 |
+ 'architecture': row[4],
|
|
| 53 |
+ 'version': row[5],
|
|
| 52 | 54 |
}
|
| 53 | 55 |
for row in requests],
|
| 54 | 56 |
}
|
| ... | ... | @@ -57,7 +57,8 @@ expected=' |
| 57 | 57 |
"codename": "sid",
|
| 58 | 58 |
"version": "42.0-1",
|
| 59 | 59 |
"architecture": "all",
|
| 60 |
- "package": "linux-image-all-signed-template"
|
|
| 60 |
+ "package": "linux-image-all-signed-template",
|
|
| 61 |
+ "source": "linux"
|
|
| 61 | 62 |
}
|
| 62 | 63 |
]
|
| 63 | 64 |
}
|