Skip to content

Commit d91dc5d

Browse files
committed
WIP: Exclude previously seen packages
this needs actually needs to accurately store the packages when we see them, as they may be removed later Signed-off-by: Gaëtan Lehmann <[email protected]>
1 parent 17d9cb0 commit d91dc5d

File tree

3 files changed

+135
-1
lines changed

3 files changed

+135
-1
lines changed
Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
XS8-normal-src/auto-cert-kit-8.4.5-1.xs8.src.rpm
2+
XS8-normal-src/biosdevname-0.3.10-5.xs8.src.rpm
3+
XS8-normal-src/blktap-3.55.5-2.xs8.src.rpm
4+
XS8-normal-src/bpftool-7.4.0-2.xs8.src.rpm
5+
XS8-normal-src/broadcom-bnxt-en-1.10.2_223.0.183.0-2.xs8.src.rpm
6+
XS8-normal-src/broadcom-mpi3mr-8.1.4.0.0-2.xs8.src.rpm
7+
XS8-normal-src/busybox-1.22.1-7.xs8.src.rpm
8+
XS8-normal-src/cisco-enic-4.5.0.7-1.xs8.src.rpm
9+
XS8-normal-src/cisco-fnic-2.0.0.90-1.xs8.src.rpm
10+
XS8-normal-src/cmake3-3.26.4-3.xs8.src.rpm
11+
XS8-normal-src/compiler-rt18-18.1.8-3.xs8.src.rpm
12+
XS8-normal-src/curl-8.6.0-2.xs8.src.rpm
13+
XS8-normal-src/devtoolset-11-gcc-11.2.1-6.xs8.src.rpm
14+
XS8-normal-src/dlm-4.0.7-2.xs8.src.rpm
15+
XS8-normal-src/dwarves-1.26-3.xs8.src.rpm
16+
XS8-normal-src/e2fsprogs-1.47.0-1.xs8.src.rpm
17+
XS8-normal-src/edk2-20220801-1.7.7.xs8.src.rpm
18+
XS8-normal-src/gdisk-1.0.10-1.xs8.src.rpm
19+
XS8-normal-src/golang-1.19.7-1.xs8.src.rpm
20+
XS8-normal-src/gpumon-24.1.0-40.xs8.src.rpm
21+
XS8-normal-src/grub-2.06-4.0.2.xs8.src.rpm
22+
XS8-normal-src/guest-templates-json-2.0.13-1.xs8.src.rpm
23+
XS8-normal-src/host-installer-10.10.25-1.xs8.src.rpm
24+
XS8-normal-src/host-upgrade-plugin-3.0.3-1.xs8.src.rpm
25+
XS8-normal-src/hwloc-2.11.1_xen1.1.1-1.xs8.src.rpm
26+
XS8-normal-src/intel-i40e-2.25.11-2.xs8.src.rpm
27+
XS8-normal-src/intel-ice-1.15.5-2.xs8.src.rpm
28+
XS8-normal-src/intel-igb-5.13.20-2.xs8.src.rpm
29+
XS8-normal-src/intel-igc-5.10.214-3.xs8.src.rpm
30+
XS8-normal-src/interface-rename-2.0.6-1.xs8.src.rpm
31+
XS8-normal-src/ipxe-20121005-1.0.7.xs8.src.rpm
32+
XS8-normal-src/ipxe-efi-20180514gite7f67d5-1.0.3.xs8.src.rpm
33+
XS8-normal-src/irqbalance-1.0.7-15.xs8.src.rpm
34+
XS8-normal-src/jemalloc-5.3.0-1.xs8.src.rpm
35+
XS8-normal-src/kernel-4.19.19-8.0.38.xs8.src.rpm
36+
XS8-normal-src/kernel-livepatch-1.0.4-1.xs8.src.rpm
37+
XS8-normal-src/kexec-tools-2.0.15-20.xs8.src.rpm
38+
XS8-normal-src/libbpf-1.4.0-3.xs8.src.rpm
39+
XS8-normal-src/libcgroup-0.41-21.xs8.src.rpm
40+
XS8-normal-src/libnbd-1.20.2-1.xs8.src.rpm
41+
XS8-normal-src/linux-guest-loader-2.3.2-2.xs8.src.rpm
42+
XS8-normal-src/livepatch-build-tools-20250121-1.xs8.src.rpm
43+
XS8-normal-src/logrotate-3.8.6-21.xs8.src.rpm
44+
XS8-normal-src/lvm2-2.02.180-18.xs8.src.rpm
45+
XS8-normal-src/mcelog-196-3.xs8.src.rpm
46+
XS8-normal-src/mellanox-mlnxen-5.9_0.5.5.0-2.xs8.src.rpm
47+
XS8-normal-src/microsemi-smartpqi-2.1.30_031-1.xs8.src.rpm
48+
XS8-normal-src/mpdecimal-2.5.1-1.xs8.src.rpm
49+
XS8-normal-src/nagios-plugins-2.4.3-3.xs8.src.rpm
50+
XS8-normal-src/ncurses-6.4-4.xs8.src.rpm
51+
XS8-normal-src/net-snmp-5.7.2-52.xs8.src.rpm
52+
XS8-normal-src/newt-0.52.23-4.xs8.src.rpm
53+
XS8-normal-src/ninja-build-1.10.2-4.xs8.src.rpm
54+
XS8-normal-src/nrpe-4.1.0-11.xs8.src.rpm
55+
XS8-normal-src/ocaml-4.14.2-1.xs8.src.rpm
56+
XS8-normal-src/ocaml-findlib-1.9.6-3.xs8.src.rpm
57+
XS8-normal-src/opam-2.1.4-4.xs8.src.rpm
58+
XS8-normal-src/openssh-7.4p1-23.3.xs8.src.rpm
59+
XS8-normal-src/openssl-1.0.2k-26.xs8.src.rpm
60+
XS8-normal-src/openvswitch-2.17.7-2.xs8.src.rpm
61+
XS8-normal-src/plymouth-0.8.9-0.31.20140113.3.xs8.src.rpm
62+
XS8-normal-src/psmisc-23.6-2.xs8.src.rpm
63+
XS8-normal-src/pyproject-rpm-macros-1.8.0-4.xs8.src.rpm
64+
XS8-normal-src/python-aiocontextvars-0.2.2-3.xs8.src.rpm
65+
XS8-normal-src/python-charset-normalizer-2.1.0-4.xs8.src.rpm
66+
XS8-normal-src/python-contextvars-2.4-3.xs8.src.rpm
67+
XS8-normal-src/python-defusedxml-0.7.1-1.xs8.src.rpm
68+
XS8-normal-src/python-deprecated-1.2.14-3.xs8.src.rpm
69+
XS8-normal-src/python-fasteners-0.9.0-3.xs8.src.rpm
70+
XS8-normal-src/python-hwinfo-0.1.11-1.xs8.src.rpm
71+
XS8-normal-src/python-idna-3.3-4.xs8.src.rpm
72+
XS8-normal-src/python-immutables-0.19-5.xs8.src.rpm
73+
XS8-normal-src/python-netaddr-0.10.1-1.xs8.src.rpm
74+
XS8-normal-src/python-pam-1.8.4-1.xs8.src.rpm
75+
XS8-normal-src/python-prettytable-0.7.2-14.xs8.src.rpm
76+
XS8-normal-src/python-psutil-5.9.1-2.xs8.src.rpm
77+
XS8-normal-src/python-pyudev-0.21.0-2.xs8.src.rpm
78+
XS8-normal-src/python-requests-2.28.1-4.xs8.src.rpm
79+
XS8-normal-src/python-tqdm-4.50.2-1.xs8.src.rpm
80+
XS8-normal-src/python-typing-extensions-3.7.4.3-4.xs8.src.rpm
81+
XS8-normal-src/python-urllib3-1.26.20-3.xs8.src.rpm
82+
XS8-normal-src/python-wheel-0.31.1-5.el7_7.src.rpm
83+
XS8-normal-src/python-wrapt-1.14.0-4.xs8.src.rpm
84+
XS8-normal-src/python-zstd-1.4.5.1-4.xs8.src.rpm
85+
XS8-normal-src/qemu-4.2.1-5.2.12.xs8.src.rpm
86+
XS8-normal-src/qemu-dp-7.0.0-17.xs8.src.rpm
87+
XS8-normal-src/qlogic-fastlinq-8.74.0.2-1.xs8.src.rpm
88+
XS8-normal-src/qlogic-qla2xxx-10.02.12.01_k-1.xs8.src.rpm
89+
XS8-normal-src/rrd-client-lib-2.0.0-1.xs8.src.rpm
90+
XS8-normal-src/rsync-3.4.1-1.xs8.src.rpm
91+
XS8-normal-src/scapy-2.4.5-3.xs8.src.rpm
92+
XS8-normal-src/sm-3.2.12-3.xs8.src.rpm
93+
XS8-normal-src/smartmontools-7.4-2.xs8.src.rpm
94+
XS8-normal-src/sm-core-libs-1.1.2-1.xs8.src.rpm
95+
XS8-normal-src/sudo-1.9.15-4.xs8.src.rpm
96+
XS8-normal-src/swtpm-0.7.3-8.xs8.src.rpm
97+
XS8-normal-src/test-ring0-1.0.7-4.xs8.src.rpm
98+
XS8-normal-src/varstored-1.2.0-2.xs8.src.rpm
99+
XS8-normal-src/vcputune-2.0.2-1.xs8.src.rpm
100+
XS8-normal-src/vendor-drivers-2.0.3-1.xs8.src.rpm
101+
XS8-normal-src/vmss-1.2.1-1.xs8.src.rpm
102+
XS8-normal-src/vncterm-10.2.1-2.xs8.src.rpm
103+
XS8-normal-src/xapi-25.6.0-1.xs8.src.rpm
104+
XS8-normal-src/xcp-python-libs-3.0.4-2.xs8.src.rpm
105+
XS8-normal-src/xcp-python-libs-compat-2.3.5-6.xs8.src.rpm
106+
XS8-normal-src/xen-4.17.5-9.xs8.src.rpm
107+
XS8-normal-src/xencert-8.4.4-1.xs8.src.rpm
108+
XS8-normal-src/xen-crashdump-analyser-2.6.1-1.xs8.src.rpm
109+
XS8-normal-src/xen-livepatch-4-3.xs8.src.rpm
110+
XS8-normal-src/xenserver-config-1.0.1-3.xs8.src.rpm
111+
XS8-normal-src/xenserver-hwdata-20240411-1.xs8.src.rpm
112+
XS8-normal-src/xenserver-nagios-plugins-1.0.6-1.xs8.src.rpm
113+
XS8-normal-src/xenserver-plymouth-theme-1.4.0-2.xs8.src.rpm
114+
XS8-normal-src/xenserver-release-8.4.0-15.xs8.src.rpm
115+
XS8-normal-src/xenserver-status-report-2.0.11-1.xs8.src.rpm
116+
XS8-normal-src/xha-25.0.0-1.xs8.src.rpm
117+
XS8-normal-src/xsconsole-11.0.8-1.xs8.src.rpm
118+
XS8-normal-src/xs-obsolete-packages-8-12.xs8.src.rpm
119+
XS8-normal-src/xs-opam-repo-6.87.0-1.xs8.src.rpm

scripts/repo_status/create_rebase_cards.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,13 @@
77
from tabulate import tabulate
88

99
import repoquery
10-
from lib import collect_data_xcpng, collect_data_xs8, get_xs8_rpm_updates, read_package_status_metadata
10+
from lib import (
11+
collect_data_xcpng,
12+
collect_data_xs8,
13+
get_xs8_rpm_updates,
14+
read_package_status_metadata,
15+
read_previous_packages,
16+
)
1117

1218
parser = argparse.ArgumentParser()
1319
parser.add_argument('-v', '--verbose', action='count', default=0)
@@ -17,6 +23,7 @@
1723
logging.basicConfig(format='[%(levelname)s] %(message)s', level=loglevel)
1824

1925
PACKAGE_STATUS = read_package_status_metadata()
26+
PREVIOUS_PACKAGES = read_previous_packages('XS8-normal-src.txt')
2027

2128
xcp_set = collect_data_xcpng()
2229
(xs8_srpms_set, xs8_rpms_sources_set) = collect_data_xs8()
@@ -34,6 +41,9 @@
3441
else:
3542
xs8_evr = xs8_srpms_evr or xs8_rpms_sources_evr
3643
xcp_evr = xcp_set.get(n)
44+
if f'{n}-{xs8_evr}.xs8' in PREVIOUS_PACKAGES:
45+
logging.info(f"ignoring previous package {n}")
46+
continue
3747
xs8_update = srpm_updates.get(f'{n}-{xs8_evr}.xs8', '?')
3848
# if xcp_evr is not None and xcp_evr < xs8_evr:
3949
if xcp_evr is None:

scripts/repo_status/lib.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import csv
44
import gzip
55
import logging
6+
import os
67
import tempfile
78
import xml.etree.ElementTree as ET
89
from collections import namedtuple
@@ -103,6 +104,10 @@ def read_package_status_metadata():
103104
return {row[0]: PackageStatus(*row[1:])
104105
for row in csvreader}
105106

107+
def read_previous_packages(path: str):
108+
with open(path) as f:
109+
return [repoquery.srpm_strip_src_rpm(os.path.basename(line.strip())) for line in f]
110+
106111
def get_xs8_rpm_updates():
107112
NS = {'repo': 'http://linux.duke.edu/metadata/repo'}
108113
BASE_URL = 'http://repos/repos/XS8/normal/xs8p-normal'

0 commit comments

Comments
 (0)