Differential D145

Multilib support for Depcheck
ClosedPublic
Actions

Authored by jskladan on Jun 17 2014, 1:10 PM.

Details

Reviewers
kparal
tflink
Maniphest Tasks
T238: Support multilib depcheck
Commits
rDEPCKb4e29e26e19c: Multilib support for Depcheck
Summary

As discussed in D139, I opted for hard-coding the depcheck.yml file to support multilib.
As a first step, i386 packages are downloaded, createrepo-d (mash's doMultilib() will do nothing) and depcheck is run for i386.
Then x86_63 rpms are downloaded, createrepo-d and mash's doMultilib() will then remove all the non-multilib i386 packages and depcheck is run.

Test Plan

tested via runtask.py several times using both rpms downloaded via the directive and with custom-contents of the repos. Needless to say that unittests work.

Diff Detail

Repository
rDEPCK task-depcheck
Lint
Lint Skipped
Unit
Unit Tests Skipped
jskladan retitled this revision from to Multilib support for Depcheck.Jun 17 2014, 1:10 PM
jskladan updated this object.
jskladan edited the test plan for this revision. (Show Details)
jskladan added reviewers: tflink, kparal.
jskladan added subscribers: jdulaney, mkrizek.
tflink accepted this revision.Jun 17 2014, 1:30 PM

My only potential concern was if mash was removing non-multilib i386 rpms for the i386-only run but after talking to @jskladan over IRC, he verified that this was not the case.

Looks like good progress to me - tested locally on f20-updates-testing-pending

This revision is now accepted and ready to land.Jun 17 2014, 1:30 PM
jskladan closed this revision.Jun 18 2014, 12:21 PM
jskladan updated this revision to Diff 423.

Closed by commit rDEPCKb4e29e26e19c (authored by @jskladan).

Revision Contents

PathPackages
Mdepcheck.yml (55 lines)
Mrun_depcheck.py (17 lines)

Diff 423

View Options

depcheck.yml

1--- 1​---
2name: depcheck 2​name: depcheck
3desc: "Check dependency trees" 3​desc: "Check dependency trees, hard-coded to run for i386 and x86_64"
4maintainer: jdulaney 4​maintainer: jdulaney
5 5​
6input: 6​input:
7 args: 7​ args:
8 - arch ​
9 - koji_tag 8​ - koji_tag
10 9​
11environment: 10​environment:
12 rpm: 11​ rpm:
13 - depcheck 12​ - depcheck
14 - libtaskotron 13​ - libtaskotron
15 14​
16task: 15​task:
17 - name: download koji tag 16​ - name: download koji tag
18 koji: 17​ koji:
19 action: download_tag 18​ action: download_tag
20 koji_tag: ${koji_tag} 19​ koji_tag: ${koji_tag}
21 arch: ${arch} 20​ arch: ['i386']
22 target_dir: "${workdir}/downloaded_tag/" 21​ target_dir: "${workdir}/downloaded_tag/"
23 22​
24 - name: mash downloaded rpms 23​ - name: mash downloaded rpms
25 mash: 24​ mash:
26 rpmdir: "${workdir}/downloaded_tag/" 25​ rpmdir: "${workdir}/downloaded_tag/"
27 dodelta: "false" 26​ dodelta: "false"
28 arch: ${arch} 27​ arch: ['i386']
29 28​
30 - name: get yum repos 29​ - name: get yum repos
31 yumrepoinfo: 30​ yumrepoinfo:
32 koji_tag: ${koji_tag} 31​ koji_tag: ${koji_tag}
33 arch: ${arch} 32​ arch: ['i386']
34 export: yumrepos 33​ export: yumrepos_i386
35 34​
36 # get repos 35​ # get repos
37 - name: run depcheck 36​ - name: run depcheck
38 python: 37​ python:
39 file: run_depcheck.py 38​ file: run_depcheck.py
40 callable: taskotron_run 39​ callable: taskotron_run
41 arch: ${arch} 40​ arch: ['i386']
42 rpms: ["${workdir}/downloaded_tag/"] 41​ rpms: ["${workdir}/downloaded_tag/"]
43 repos: 42​ repos:
44 - ${yumrepos} 43​ - ${yumrepos_i386}
45 - "workdir_repo": "${workdir}/downloaded_tag/" 44​ - "workdir_repo": "${workdir}/downloaded_tag/"
46 report_format: "rpms" 45​ report_format: "rpms"
47 export: depcheck_output 46​ export: depcheck_output_i386
48 47​
49# - name: report results to resultsdb 48​# - name: report results to resultsdb
50# resultsdb: 49​# resultsdb:
51# results: "{{ depcheck_output }}" 50​# results: "{{ depcheck_output_i386 }}"
51​
52​ - name: download koji tag
53​ koji:
54​ action: download_tag
55​ koji_tag: ${koji_tag}
56​ arch: ['x86_64']
57​ target_dir: "${workdir}/downloaded_tag/"
58​
59​ - name: mash downloaded rpms
60​ mash:
61​ rpmdir: "${workdir}/downloaded_tag/"
62​ dodelta: "false"
63​ arch: ['x86_64']
64​
65​ - name: get yum repos
66​ yumrepoinfo:
67​ koji_tag: ${koji_tag}
68​ arch: ['x86_64']
69​ export: yumrepos_x86_64
70​
71​ # get repos
72​ - name: run depcheck
73​ python:
74​ file: run_depcheck.py
75​ callable: taskotron_run
76​ arch: ['x86_64']
77​ rpms: ["${workdir}/downloaded_tag/"]
78​ repos:
79​ - ${yumrepos_x86_64}
80​ - "workdir_repo": "${workdir}/downloaded_tag/"
81​ report_format: "rpms"
82​ export: depcheck_output_x86_64
83​
84​# - name: report results to resultsdb
85​# resultsdb:
86​# results: "{{ depcheck_output_x86_64 }}"
52 87​
View Options

run_depcheck.py

1#!/usr/bin/python 1​#!/usr/bin/python
2 2​
3import sys 3​import sys
4import os 4​import os
5 5​
6sys.path.insert(0, os.path.realpath(os.path.dirname(__file__))) 6​sys.path.insert(0, os.path.realpath(os.path.dirname(__file__)))
7 7​
8import depcheck 8​import depcheck
9from depcheck import exc 9​from depcheck import exc
10 10​
11def taskotron_run(rpms, arch, repos, report_format): 11​def taskotron_run(rpms, arch, repos, report_format):
12 """ 12​ """
13 rpms: list of rpm files and/or directories containing rpm files 13​ rpms: list of rpm files and/or directories containing rpm files
14 arch: list of arches 14​ arch: list of arches that can contain just one 'primary' arch
15 repos: dictionary or list of dictionaries 15​ repos: dictionary or list of dictionaries
16 report_format: "rpms" or "updates" 16​ report_format: "rpms" or "updates"
17 """ 17​ """
18 18​
19 # FIXME: do something saner in the future - nasty fix for the moment 19​ # FIXME: do something saner in the future - nasty fix for the moment
20 filtered_arches = [a for a in arch if a not in ['noarch', 'all', 'src']] 20​ filtered_arches = [a for a in arch if a not in ['noarch', 'all', 'src']]
21 if len(filtered_arches) != 1: 21​
22 raise exc.DepcheckException("Invalid content of arches after filtering:" 22​ if len(filtered_arches) > 1:
23​ raise exc.DepcheckException("Too many 'primary' arches provided:"
23 " %r" % filtered_arches) 24​ " %r" % filtered_arches)
24 arch = filtered_arches[0] 25​ if len(filtered_arches) == 0:
26​ raise exc.DepcheckException("No 'primary' arch provided")
27​
28​ arch = filtered_arches[0].strip()
29​
30​ # libsolv is stupid, and can not make this on its own
31​ # TODO: try to find a better (more elegant) solution
32​ if arch == "i386":
33​ arch = "i686"
25 34​
26 repositories = {} 35​ repositories = {}
27 36​
28 if isinstance(repos, list): 37​ if isinstance(repos, list):
29 for repo in repos: 38​ for repo in repos:
30 for name, url in repo.items(): 39​ for name, url in repo.items():
31 while name in repositories: 40​ while name in repositories:
32 name += "_" 41​ name += "_"
Show All 12 Lines