!13 update version to 1.29.3
From: @xujing99 Reviewed-by: @licunlong Signed-off-by: @licunlong
This commit is contained in:
openeuler-ci-bot
Gitee
commit
c4da902e69
BIN
1.18.1.tar.gz
BIN
1.18.1.tar.gz
Binary file not shown.
BIN
1.29.3.tar.gz
Normal file
BIN
1.29.3.tar.gz
Normal file
Binary file not shown.
@ -1,36 +0,0 @@
|
||||
From 4c95895113d549b5b3b84fe1282fb13d9f5823a0 Mon Sep 17 00:00:00 2001
|
||||
From: Florian Weimer <fweimer@redhat.com>
|
||||
Date: Fri, 29 May 2020 17:22:35 +0200
|
||||
Subject: [PATCH 1/2] journal.sh: Count CPUs optimization
|
||||
|
||||
---
|
||||
src/journal.sh | 13 ++++---------
|
||||
1 file changed, 4 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/src/journal.sh b/src/journal.sh
|
||||
index f7f2fbd..74dc525 100644
|
||||
--- a/src/journal.sh
|
||||
+++ b/src/journal.sh
|
||||
@@ -872,15 +872,10 @@ __INTERNAL_CreateHeader(){
|
||||
local line size
|
||||
# CPU info
|
||||
if [ -f "/proc/cpuinfo" ]; then
|
||||
- local count=0
|
||||
- local type="unknown"
|
||||
- local cpu_regex="^model\sname.*: (.*)$"
|
||||
- while read -r line; do
|
||||
- if [[ "$line" =~ $cpu_regex ]]; then
|
||||
- type="${BASH_REMATCH[1]}"
|
||||
- let count++
|
||||
- fi
|
||||
- done < "/proc/cpuinfo"
|
||||
+ local cpu_regex count type
|
||||
+ cpu_regex="^model\sname.*: (.*)$"
|
||||
+ count=$(grep -cE "$cpu_regex" /proc/cpuinfo)
|
||||
+ type="$(grep -E -m 1 "$cpu_regex" /proc/cpuinfo | sed -r "s/$cpu_regex/\1/")"
|
||||
__INTERNAL_WriteToMetafile hw_cpu -- "$count x $type"
|
||||
__INTERNAL_LogText " CPUs : $count x $type" 2> /dev/null
|
||||
fi
|
||||
--
|
||||
2.25.4
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From e90f1c3909b7221a442b9df5f05258e2ace61143 Mon Sep 17 00:00:00 2001
|
||||
From dcd5f6b38e895134bb24df4c8fa4a0fba3e0f381 Mon Sep 17 00:00:00 2001
|
||||
From: yixiangzhike <yixiangzhike007@163.com>
|
||||
Date: Mon, 12 Jun 2023 14:50:53 +0800
|
||||
Subject: [PATCH] beakerlib adapt product feature to local release version
|
||||
Date: Mon, 29 May 2023 11:22:03 +0800
|
||||
Subject: [PATCH] Adapt product feature to local release version
|
||||
|
||||
---
|
||||
src/journal.sh | 6 +++++-
|
||||
@ -11,15 +11,15 @@ Subject: [PATCH] beakerlib adapt product feature to local release version
|
||||
4 files changed, 23 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/journal.sh b/src/journal.sh
|
||||
index ce51c2e..5fa5570 100644
|
||||
index 62ce983..8ae06e6 100644
|
||||
--- a/src/journal.sh
|
||||
+++ b/src/journal.sh
|
||||
@@ -840,7 +840,11 @@ __INTERNAL_CreateHeader(){
|
||||
@@ -874,7 +874,11 @@ __INTERNAL_CreateHeader(){
|
||||
__INTERNAL_LogText " Test duration : " 2> /dev/null
|
||||
|
||||
# OS release
|
||||
- local release=$(cat /etc/redhat-release)
|
||||
+ if [ -e /etc/openEuler-release ];then
|
||||
+ if [ -e /etc/openEuler-release ]; then
|
||||
+ local release=$(cat /etc/openEuler-release)
|
||||
+ else
|
||||
+ local release=$(cat /etc/redhat-release)
|
||||
@ -28,42 +28,42 @@ index ce51c2e..5fa5570 100644
|
||||
__INTERNAL_WriteToMetafile release -- "$release"
|
||||
__INTERNAL_LogText " Distro : ${release}" 2> /dev/null
|
||||
diff --git a/src/logging.sh b/src/logging.sh
|
||||
index d63e95f..afd98ec 100644
|
||||
index 738bef0..96455c7 100644
|
||||
--- a/src/logging.sh
|
||||
+++ b/src/logging.sh
|
||||
@@ -851,7 +851,9 @@ on the RHEL-5-Client you will get release 5 and variant Client.
|
||||
@@ -881,7 +881,9 @@ on the RHEL-5-Client you will get release 5 and variant Client.
|
||||
|
||||
__rlGetDistroVersion() {
|
||||
__INTERNAL_rlGetDistroVersion() {
|
||||
local version=0
|
||||
- if rpm -q redhat-release &>/dev/null; then
|
||||
+ if rpm -q openEuler-release &>/dev/null; then
|
||||
+ version=$( rpm -q --qf="%{VERSION}" openEuler-release )
|
||||
+ version=$( rpm -q --qf="%{VERSION}" openEuler-release )
|
||||
+ elif rpm -q redhat-release &>/dev/null; then
|
||||
version=$( rpm -q --qf="%{VERSION}" redhat-release )
|
||||
elif rpm -q fedora-release &>/dev/null; then
|
||||
version=$( rpm -q --qf="%{VERSION}" fedora-release )
|
||||
@@ -869,6 +871,12 @@ rlGetDistroRelease() {
|
||||
__rlGetDistroVersion | sed "s/^\([0-9.]\+\)[^0-9.]\+.*$/\1/" | sed "s/6\.9[0-9]/7/" | cut -d '.' -f 1
|
||||
@@ -905,6 +907,12 @@ rlGetDistroRelease() {
|
||||
}
|
||||
rlGetDistroVariant() {
|
||||
local VARIANT
|
||||
+ # openEuler has no Variant
|
||||
+ if rpm -q openEuler-release &>/dev/null; then
|
||||
+ echo ""
|
||||
+ echo $VARIANT
|
||||
+ return 0
|
||||
+ fi
|
||||
+
|
||||
VARIANT="$(__rlGetDistroVersion | sed "s/^[0-9.]\+\(.*\)$/\1/")"
|
||||
if [ -z "$VARIANT" ]; then
|
||||
rpm -q --qf="%{NAME}" --whatprovides redhat-release | cut -c 16- | sed 's/.*/\u&/'
|
||||
VARIANT=$(__INTERNAL_rlGetOSReleaseItem VARIANT) && {
|
||||
echo $VARIANT
|
||||
return 0
|
||||
diff --git a/src/lsb_release b/src/lsb_release
|
||||
index 9d7afbc..530e6b5 100755
|
||||
index 9d7afbc..8b04c75 100755
|
||||
--- a/src/lsb_release
|
||||
+++ b/src/lsb_release
|
||||
@@ -72,7 +72,11 @@ INFO_LSB_DIR="lsb-release.d" # where to get LSB addon modules
|
||||
INFO_DISTRIB_SUFFIX="release" # <distrib>-<suffix>
|
||||
ALTERNATE_DISTRIB_FILE="/etc/debian_version" # for Debian [based distrib]
|
||||
ALTERNATE_DISTRIB_NAME="Debian" # "
|
||||
+if [ -e /etc/openEuler-release ];then
|
||||
+if [ -e /etc/openEuler-release ]; then
|
||||
+CHECKFIRST="/etc/openEuler-release" # check it before file search
|
||||
+else
|
||||
CHECKFIRST="/etc/redhat-release" # check it before file search
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
Name: beakerlib
|
||||
Summary: A shell-level integration testing library
|
||||
Version: 1.18.1
|
||||
Release: 3
|
||||
Version: 1.29.3
|
||||
Release: 1
|
||||
License: GPLv2
|
||||
BuildArch: noarch
|
||||
URL: https://github.com/%{name}/%{name}
|
||||
@ -24,11 +24,7 @@ BuildRequires: /usr/bin/pod2man perl-generators util-linux
|
||||
|
||||
Source0: https://github.com/beakerlib/beakerlib/archive/%{version}.tar.gz
|
||||
|
||||
Patch0: bugzilla-links.patch
|
||||
Patch1: python3.patch
|
||||
Patch2: Count-CPUs-optimization.patch
|
||||
Patch3: enahanced-library-search.patch
|
||||
Patch4: beakerlib-adapt-product-feature-to-local-release-version.patch
|
||||
Patch1: beakerlib-adapt-product-feature-to-local-release-version.patch
|
||||
|
||||
%package_help
|
||||
|
||||
@ -83,6 +79,9 @@ Files for syntax highlighting BeakerLib tests in VIM editor
|
||||
%doc %{_pkgdocdir}/*
|
||||
|
||||
%changelog
|
||||
* Tue Oct 24 2023 xujing <xujing125@huawei.com> - 1.29.3-1
|
||||
- update version to 1.29.3
|
||||
|
||||
* Mon Jun 12 2023 yixiangzhike <yixiangzhike007@163.com> - 1.18.1-3
|
||||
- beakerlib adapt product feature to local release version
|
||||
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
diff --git a/src/beakerlib.sh b/src/beakerlib.sh
|
||||
index 3355fa4..ceafc44 100644
|
||||
--- a/src/beakerlib.sh
|
||||
+++ b/src/beakerlib.sh
|
||||
@@ -274,10 +274,14 @@ https://github.com/beakerlib/beakerlib/wiki/man
|
||||
|
||||
=item Issues list
|
||||
|
||||
+https://bugzilla.redhat.com/buglist.cgi?component=beakerlib&&order=bug_status%2Cassigned_to%2Cpriority
|
||||
+
|
||||
https://github.com/beakerlib/beakerlib/issues
|
||||
|
||||
=item Reporting issues
|
||||
|
||||
+https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=beakerlib
|
||||
+
|
||||
https://github.com/beakerlib/beakerlib/issues/new
|
||||
|
||||
=back
|
||||
@ -1,122 +0,0 @@
|
||||
From 6caca72e63add35ef066cca1dbeae6857ec34b2b Mon Sep 17 00:00:00 2001
|
||||
From: Dalibor Pospisil <dapospis@redhat.com>
|
||||
Date: Mon, 8 Jun 2020 17:11:51 +0200
|
||||
Subject: [PATCH 2/2] enahanced library search
|
||||
|
||||
---
|
||||
src/libraries.sh | 71 ++++++++++++++++++++++++++++++++++++++----------
|
||||
1 file changed, 56 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/src/libraries.sh b/src/libraries.sh
|
||||
index 2ccc02e..b40b513 100644
|
||||
--- a/src/libraries.sh
|
||||
+++ b/src/libraries.sh
|
||||
@@ -98,7 +98,7 @@ __INTERNAL_rlLibraryTraverseUpwards() {
|
||||
while [ "$DIRECTORY" != "/" ]
|
||||
do
|
||||
DIRECTORY="$( dirname $DIRECTORY )"
|
||||
- if [ -d "$DIRECTORY/$COMPONENT" ]
|
||||
+ if [[ -d "$DIRECTORY/$COMPONENT" || -d "$DIRECTORY/libs/$COMPONENT/$LIBRARY" ]]
|
||||
then
|
||||
|
||||
local CANDIDATE="$DIRECTORY/$COMPONENT/Library/$LIBRARY/lib.sh"
|
||||
@@ -114,6 +114,14 @@ __INTERNAL_rlLibraryTraverseUpwards() {
|
||||
LIBFILE="$CANDIDATE"
|
||||
break
|
||||
fi
|
||||
+
|
||||
+ local CANDIDATE="$DIRECTORY/libs/$COMPONENT/$LIBRARY/lib.sh"
|
||||
+ if [ -f "$CANDIDATE" ]
|
||||
+ then
|
||||
+ LIBFILE="$CANDIDATE"
|
||||
+ break
|
||||
+ fi
|
||||
+
|
||||
fi
|
||||
done
|
||||
}
|
||||
@@ -139,6 +147,20 @@ __INTERNAL_rlLibrarySearchInRoot(){
|
||||
return
|
||||
fi
|
||||
|
||||
+ local CANDIDATE="$BEAKERLIB_LIBRARY_PATH/$COMPONENT/$LIBRARY/lib.sh"
|
||||
+ if [ -f "$CANDIDATE" ]
|
||||
+ then
|
||||
+ LIBFILE="$CANDIDATE"
|
||||
+ return
|
||||
+ fi
|
||||
+
|
||||
+ local CANDIDATE="$BEAKERLIB_LIBRARY_PATH/libs/$COMPONENT/$LIBRARY/lib.sh"
|
||||
+ if [ -f "$CANDIDATE" ]
|
||||
+ then
|
||||
+ LIBFILE="$CANDIDATE"
|
||||
+ return
|
||||
+ fi
|
||||
+
|
||||
rlLogDebug "rlImport: Library not found in $BEAKERLIB_LIBRARY_PATH"
|
||||
}
|
||||
|
||||
@@ -151,16 +173,20 @@ __INTERNAL_rlLibrarySearch() {
|
||||
|
||||
if [ -n "$BEAKERLIB_LIBRARY_PATH" ]
|
||||
then
|
||||
- rlLogDebug "rlImport: BEAKERLIB_LIBRARY_PATH is set: trying to search in it"
|
||||
-
|
||||
- __INTERNAL_rlLibrarySearchInRoot "$COMPONENT" "$LIBRARY" "$BEAKERLIB_LIBRARY_PATH"
|
||||
- if [ -n "$LIBFILE" ]
|
||||
- then
|
||||
- local VERSION="$(__INTERNAL_extractLibraryVersion "$LIBFILE" "$COMPONENT/$LIBRARY")"
|
||||
- VERSION=${VERSION:+", version '$VERSION'"}
|
||||
- rlLogInfo "rlImport: Found '$COMPONENT/$LIBRARY'$VERSION in BEAKERLIB_LIBRARY_PATH"
|
||||
- return
|
||||
- fi
|
||||
+ rlLogDebug "rlImport: BEAKERLIB_LIBRARY_PATH='$BEAKERLIB_LIBRARY_PATH'"
|
||||
+ local paths=( ${BEAKERLIB_LIBRARY_PATH//:/ } )
|
||||
+ while [[ -n "$paths" ]]; do
|
||||
+ rlLogDebug "$FUNCNAME(): trying $paths component of BEAKERLIB_LIBRARY_PATH"
|
||||
+ __INTERNAL_rlLibrarySearchInRoot "$COMPONENT" "$LIBRARY" "$paths"
|
||||
+ if [ -n "$LIBFILE" ]
|
||||
+ then
|
||||
+ local VERSION="$(__INTERNAL_extractLibraryVersion "$LIBFILE" "$COMPONENT/$LIBRARY")"
|
||||
+ VERSION=${VERSION:+", version '$VERSION'"}
|
||||
+ rlLogInfo "rlImport: Found '$COMPONENT/$LIBRARY'$VERSION in BEAKERLIB_LIBRARY_PATH"
|
||||
+ return
|
||||
+ fi
|
||||
+ paths=( "${paths[@]:1}" )
|
||||
+ done
|
||||
else
|
||||
rlLogDebug "rlImport: No BEAKERLIB_LIBRARY_PATH set: trying default"
|
||||
fi
|
||||
@@ -213,10 +239,25 @@ The library search mechanism is based on Beaker test hierarchy system, i.e.:
|
||||
|
||||
/component/type/test-name/test-file
|
||||
|
||||
-When test-file calls rlImport with 'foo/bar' parameter, the directory path
|
||||
-is traversed upwards, and a check for presence of the test /foo/Library/bar/
|
||||
-will be performed. This means this function needs to be called from
|
||||
-the test hierarchy, not e.g. the /tmp directory.
|
||||
+When test-file calls rlImport with 'foo/bar' parameter, the libraries are searched
|
||||
+in following locations:
|
||||
+these are the possible path prefixes
|
||||
+
|
||||
+ - colon-separated paths from $BEAKERLIB_LIBRARY_PATH
|
||||
+ - /mnt/tests
|
||||
+ - /usr/share/beakerlib-libraries
|
||||
+
|
||||
+the next component of the path is one of the following:
|
||||
+
|
||||
+ - /foo/Library/bar
|
||||
+ - /*/foo/Library/bar
|
||||
+ - /libs/foo/bar
|
||||
+
|
||||
+the directory path is then constructed as prefix/path/lib.sh
|
||||
+If the library is still not found an upwards directory traversal is used, and a
|
||||
+check for presence of the library in /foo/Library/bar/ or libs/foo/bar/ is to be
|
||||
+performed. This means this function needs to be called from the test hierarchy,
|
||||
+not e.g. the /tmp directory.
|
||||
|
||||
Once library is found, it is sourced and a verifier function is called.
|
||||
The verifier function is cunstructed by composing the library prefix and
|
||||
--
|
||||
2.25.4
|
||||
|
||||
@ -1,57 +0,0 @@
|
||||
diff -ur beakerlib-1.18.old/src/python/journal-compare.py beakerlib-1.18.new/src/python/journal-compare.py
|
||||
--- beakerlib-1.18.old/src/python/journal-compare.py 2019-04-04 11:20:55.000000000 +0200
|
||||
+++ beakerlib-1.18.new/src/python/journal-compare.py 2019-04-04 11:20:23.000000000 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/env python3
|
||||
|
||||
# Copyright (c) 2006 Red Hat, Inc. All rights reserved. This copyrighted material
|
||||
# is made available to anyone wishing to use, modify, copy, or
|
||||
diff -ur beakerlib-1.18.old/src/python/journalling.py beakerlib-1.18.new/src/python/journalling.py
|
||||
--- beakerlib-1.18.old/src/python/journalling.py 2019-04-04 11:20:55.000000000 +0200
|
||||
+++ beakerlib-1.18.new/src/python/journalling.py 2019-04-04 11:20:27.000000000 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/env python3
|
||||
|
||||
# Authors: Jakub Heger <jheger@redhat.com>
|
||||
# Dalibor Pospisil <dapospis@redhat.com>
|
||||
diff -ur beakerlib-1.18.old/src/python/rlMemAvg.py beakerlib-1.18.new/src/python/rlMemAvg.py
|
||||
--- beakerlib-1.18.old/src/python/rlMemAvg.py 2019-04-04 11:20:55.000000000 +0200
|
||||
+++ beakerlib-1.18.new/src/python/rlMemAvg.py 2019-04-04 11:20:30.000000000 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/env python3
|
||||
|
||||
# Authors: Petr Muller <pmuller@redhat.com>
|
||||
#
|
||||
diff -ur beakerlib-1.18.old/src/python/rlMemPeak.py beakerlib-1.18.new/src/python/rlMemPeak.py
|
||||
--- beakerlib-1.18.old/src/python/rlMemPeak.py 2019-04-04 11:20:55.000000000 +0200
|
||||
+++ beakerlib-1.18.new/src/python/rlMemPeak.py 2019-04-04 11:20:33.000000000 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/env python3
|
||||
|
||||
# Authors: Petr Muller <pmuller@redhat.com>
|
||||
#
|
||||
diff -ur beakerlib-1.18.old/src/python/testwatcher.py beakerlib-1.18.new/src/python/testwatcher.py
|
||||
--- beakerlib-1.18.old/src/python/testwatcher.py 2019-04-04 11:20:55.000000000 +0200
|
||||
+++ beakerlib-1.18.new/src/python/testwatcher.py 2019-04-04 11:20:36.000000000 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/env python3
|
||||
#
|
||||
# Authors: Jiri Jaburek <jjaburek@redhat.com>
|
||||
#
|
||||
diff -ur beakerlib-1.18.old/src/journal.sh beakerlib-1.18.new/src/journal.sh
|
||||
--- beakerlib-1.18.old/src/journal.sh
|
||||
+++ beakerlib-1.18.new/src/journal.sh
|
||||
@@ -299,7 +299,7 @@ rlJournalEnd(){
|
||||
__INTERNAL_JournalXMLCreate() {
|
||||
local res=0
|
||||
[[ "$BEAKERLIB_JOURNAL" == "0" ]] || {
|
||||
- if which python &> /dev/null; then
|
||||
+ if which python3 &> /dev/null; then
|
||||
$__INTERNAL_JOURNALIST $__INTERNAL_XSLT --metafile \
|
||||
"$__INTERNAL_BEAKERLIB_METAFILE" --journal "$__INTERNAL_BEAKERLIB_JOURNAL"
|
||||
res=$?
|
||||
Loading…
x
Reference in New Issue
Block a user