Browse code
MAKECHECK JOB: Added skip list for makecheck job
- Job is getting stuck in gtk-doc, socat, and libmspack
and it failed while running makecheck so skipping these packages
for now. Later it can be fixed.
List currently have 3 packages , once these are fixed can be removed
from the skip list
- createrepo: added a requires for installation
Change-Id: Idcf4ca8c2049bd9a70b41e6fa3d8f44f505b4dff
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/7461
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Srivatsa S. Bhat <srivatsab@vmware.com>
(cherry picked from commit 5c069e8b8dee09c827e13fb89a678e8b67507ce2)
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/7501
Tested-by: michellew <michellew@vmware.com>
Ankit Jain authored on 2019/06/12 19:11:59Showing 3 changed files
- SPECS/createrepo_c/createrepo_c.spec
- support/package-builder/PackageUtils.py
- support/package-builder/constants.py
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Creates a common metadata repository |
| 2 | 2 |
Name: createrepo_c |
| 3 | 3 |
Version: 0.11.1 |
| 4 |
-Release: 1%{?dist}
|
|
| 4 |
+Release: 2%{?dist}
|
|
| 5 | 5 |
License: GPLv2+ |
| 6 | 6 |
Group: System Environment/Base |
| 7 | 7 |
Vendor: VMware, Inc. |
| ... | ... |
@@ -20,6 +20,9 @@ BuildRequires: rpm-devel |
| 20 | 20 |
BuildRequires: xz-devel |
| 21 | 21 |
BuildRequires: sqlite-devel |
| 22 | 22 |
BuildRequires: python3-devel |
| 23 |
+%if %{with_check}
|
|
| 24 |
+Requires: libxml2 |
|
| 25 |
+%endif |
|
| 23 | 26 |
Obsoletes: createrepo |
| 24 | 27 |
Provides: createrepo |
| 25 | 28 |
Provides: /bin/mergerepo |
| ... | ... |
@@ -74,6 +77,8 @@ ln -sf %{_bindir}/modifyrepo_c %{buildroot}%{_bindir}/modifyrepo
|
| 74 | 74 |
%{_lib64dir}/pkgconfig/%{name}.pc
|
| 75 | 75 |
|
| 76 | 76 |
%changelog |
| 77 |
+* Wed Jun 19 2019 Ankit Jain <ankitja@vmware.com> 0.11.1-2 |
|
| 78 |
+- Added libxml2 as Requires for makecheck. |
|
| 77 | 79 |
* Tue Sep 04 2018 Keerthana K <keerthanak@vmware.com> 0.11.1-1 |
| 78 | 80 |
- Updated to version 0.11.1. |
| 79 | 81 |
* Mon Jun 04 2018 Xiaolin Li <xiaolinl@vmware.com> 0.10.0-2 |
| ... | ... |
@@ -240,7 +240,8 @@ class PackageUtils(object): |
| 240 | 240 |
|
| 241 | 241 |
if constants.rpmCheck and package in constants.testForceRPMS: |
| 242 | 242 |
self.logger.debug("#" * (68 + 2 * len(package)))
|
| 243 |
- if not SPECS.getData().isCheckAvailable(package, version): |
|
| 243 |
+ if (not SPECS.getData().isCheckAvailable(package, version)) or \ |
|
| 244 |
+ (package in constants.listMakeCheckPkgToSkip): |
|
| 244 | 245 |
self.logger.info("####### " + package +
|
| 245 | 246 |
" MakeCheck is not available. Skipping MakeCheck TEST for " + |
| 246 | 247 |
package + " #######") |
| ... | ... |
@@ -264,7 +265,8 @@ class PackageUtils(object): |
| 264 | 264 |
returnVal = sandbox.run(rpmBuildcmd, logfile = logFile) |
| 265 | 265 |
|
| 266 | 266 |
if constants.rpmCheck and package in constants.testForceRPMS: |
| 267 |
- if not SPECS.getData().isCheckAvailable(package, version): |
|
| 267 |
+ if (not SPECS.getData().isCheckAvailable(package, version)) or \ |
|
| 268 |
+ (package in constants.listMakeCheckPkgToSkip): |
|
| 268 | 269 |
constants.testLogger.info(package + " : N/A") |
| 269 | 270 |
elif returnVal == 0: |
| 270 | 271 |
constants.testLogger.info(package + " : PASS") |
| ... | ... |
@@ -287,6 +287,15 @@ class constants(object): |
| 287 | 287 |
"glibc", |
| 288 | 288 |
"tar"] |
| 289 | 289 |
|
| 290 |
+ # List of Packages which causes "Makecheck" job |
|
| 291 |
+ # to stuck indefinately or getting failed. |
|
| 292 |
+ # Until these pkgs %check is fixed, these pkgs will be |
|
| 293 |
+ # skip to run makecheck. |
|
| 294 |
+ listMakeCheckPkgToSkip = [ |
|
| 295 |
+ "gtk-doc", |
|
| 296 |
+ "libmspack", |
|
| 297 |
+ "socat"] |
|
| 298 |
+ |
|
| 290 | 299 |
# .spec file might contain lines such as |
| 291 | 300 |
# Requires(post):/sbin/useradd |
| 292 | 301 |
# Build system should interpret it as |