import weldr-client-35.2-2.el9

This commit is contained in:
CentOS Sources 2021-11-03 12:59:26 -04:00 committed by Stepan Oksanichenko
parent 6fbb359a8e
commit 34f542c04e
6 changed files with 125 additions and 16 deletions

2
.gitignore vendored
View File

@ -1,2 +1,2 @@
SOURCES/gpg-117E8C168EFE3A7F.key SOURCES/gpg-117E8C168EFE3A7F.key
SOURCES/weldr-client-35.1.tar.gz SOURCES/weldr-client-35.2.tar.gz

View File

@ -1,2 +1,2 @@
7236a544c634e1f248d2cea7b52e1b5dc50727ff SOURCES/gpg-117E8C168EFE3A7F.key 9a95f2c777b4fca2c9c5705ed330cafcf1b09555 SOURCES/gpg-117E8C168EFE3A7F.key
c0c0422eec75a0b5409c5aa5147cc796a8043008 SOURCES/weldr-client-35.1.tar.gz fd9aaab62c5ee5c44704b815b8690fbb5d2db199 SOURCES/weldr-client-35.2.tar.gz

View File

@ -0,0 +1,74 @@
From edeafc1b677eb0f362fdb60fbb624ad8e1632c21 Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Wed, 25 Aug 2021 09:00:48 -0700
Subject: [PATCH] tests: Fix integration tests
osbuild-composer v31 returns a more detailed error for
TestStartComposeBadType, so that has been changed.
The number of image types returned depends on the distribution being
used, so change to looking for >= 6 of them.
The source type depends on the first repo in the list, so it could be
any of the supported types. They all start with "yum-" so change the
test to look for that instead.
---
weldr/compose_test.go | 6 +++---
weldr/sources_test.go | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/weldr/compose_test.go b/weldr/compose_test.go
index 7479edf..fda6953 100644
--- a/weldr/compose_test.go
+++ b/weldr/compose_test.go
@@ -30,7 +30,7 @@ func TestGetComposeTypes(t *testing.T) {
require.Nil(t, err)
require.Nil(t, r)
require.NotNil(t, types)
- assert.Equal(t, 6, len(types))
+ assert.GreaterOrEqual(t, len(types), 6)
assert.Contains(t, types, "openstack")
}
@@ -44,7 +44,7 @@ func TestGetComposeTypesDistro(t *testing.T) {
require.Nil(t, err)
require.Nil(t, r)
require.NotNil(t, types)
- assert.Equal(t, 6, len(types))
+ assert.GreaterOrEqual(t, len(types), 6)
assert.Contains(t, types, "openstack")
}
@@ -141,7 +141,7 @@ func TestStartComposeBadType(t *testing.T) {
require.Nil(t, err)
require.NotNil(t, r)
assert.False(t, r.Status)
- assert.Equal(t, APIErrorMsg{"UnknownComposeType", "Unknown compose type for architecture: punchcard"}, r.Errors[0])
+ assert.Equal(t, APIErrorMsg{"ComposeError", "Failed to get compose type \"punchcard\": invalid image type: punchcard"}, r.Errors[0])
}
func TestStartComposeBadDepsolve(t *testing.T) {
diff --git a/weldr/sources_test.go b/weldr/sources_test.go
index 77eb357..18b00f1 100644
--- a/weldr/sources_test.go
+++ b/weldr/sources_test.go
@@ -7,6 +7,7 @@
package weldr
import (
+ "strings"
"testing"
"github.com/stretchr/testify/assert"
@@ -40,7 +41,7 @@ func TestGetSourcesJSON(t *testing.T) {
assert.Equal(t, names[0], id)
sourceType, ok := sources[names[0]].(map[string]interface{})["type"].(string)
require.True(t, ok)
- assert.Equal(t, "yum-metalink", sourceType)
+ assert.True(t, strings.HasPrefix(sourceType, "yum-"))
}
func TestGetSourcesJSONError(t *testing.T) {
--
2.31.1

View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEEtMa0UeT6i0IyyhkeEX6MFo7+On8FAmB0v1oACgkQEX6MFo7+
On/fBQgAheXV7RRzQEKiYTc53dNKY2+jTzy++W2BpBnpMVIkcu8LjSLQ9sD2AF5o
90aeeTnMs4o2YKjInj2Rl/TfnA0JfHl+es/QcpKwM6Tl7Znn9570hRy10JuRojSe
4Lq8wxcr8m5oxAzE1UAvz4ws0xdgHwvhPJJUfMNXANj5BX7M/5A3493zDAkwvQ9H
3VdPenPgZk2nwjml0IgtTR+sRn1aJC0yXYtcP2bAlOV3sAklVkIGhL3E9bh78Bbj
oRCN50Bw3jrFmhisfT1HhKtW0B64mg12uIXAqi0S471O4eiy4cF6SFh9L5bSqaTZ
Zw1nTyzykUR0DCtQ6n/Vcqo7jl8Fsw==
=YWa+
-----END PGP SIGNATURE-----

View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEEtMa0UeT6i0IyyhkeEX6MFo7+On8FAmEj7bEACgkQEX6MFo7+
On92OQf/R5g0eRQd0eiDY7jiq+5j1WIVK1OaVTFduo8RhqaK08gfwW8Z51wi3bu4
yyO6MriYN230x5ZBcEgbnVmjDQIl2HLqTEFpGAyNEuh/bHVNNeNT6dAkcexoUb8N
Rwe6KWm/0vwxkD2X7WI+WlCLp0cNJ+foLbkZ1sMeNaHekuJCRAPDQkdEN/nwFn5M
ZPgH1bSS2XBkg8JbNwEFfWcjGlPfmPHJMv1+1i/W0EAp7/uYbPz+FEX0W/aXQ7fI
l/KxFq8Tt+Zk2qIw+XN9dzV2E2ngayvsM3Vm5igTl+HMRIe5Ro3RuFHp3HbFmZ8M
xqXZS0aSbMBqv4TQEtsnnXku9SusVQ==
=8+eY
-----END PGP SIGNATURE-----

View File

@ -1,18 +1,24 @@
# Pass --with tests to rpmbuild to build composer-cli-tests # Pass --with tests to rpmbuild to build composer-cli-tests
%bcond_with tests %bcond_with tests
# Pass --without signed to skip gpg signed tar.gz (DO NOT DO THAT IN PRODUCTION)
%bcond_without signed
%global goipath github.com/osbuild/weldr-client %global goipath github.com/osbuild/weldr-client
Name: weldr-client Name: weldr-client
Version: 35.1 Version: 35.2
Release: 4%{?dist} Release: 2%{?dist}
# Upstream license specification: Apache-2.0 # Upstream license specification: Apache-2.0
License: ASL 2.0 License: ASL 2.0
Summary: Command line utility to control osbuild-composer Summary: Command line utility to control osbuild-composer
Url: %{gourl} Url: %{gourl}
Source0: https://github.com/osbuild/weldr-client/releases/download/v%{version}/%{name}-%{version}.tar.gz Source0: https://github.com/osbuild/weldr-client/releases/download/v%{version}/%{name}-%{version}.tar.gz
%if %{with signed}
Source1: https://github.com/osbuild/weldr-client/releases/download/v%{version}/%{name}-%{version}.tar.gz.asc Source1: https://github.com/osbuild/weldr-client/releases/download/v%{version}/%{name}-%{version}.tar.gz.asc
Source2: https://keys.openpgp.org/vks/v1/by-fingerprint/117E8C168EFE3A7F#/gpg-117E8C168EFE3A7F.key Source2: https://keys.openpgp.org/vks/v1/by-fingerprint/117E8C168EFE3A7F#/gpg-117E8C168EFE3A7F.key
%endif
Patch0001: 0001-tests-Fix-integration-tests.patch
Obsoletes: composer-cli < 35.0 Obsoletes: composer-cli < 35.0
Provides: composer-cli = %{version}-%{release} Provides: composer-cli = %{version}-%{release}
@ -37,7 +43,9 @@ BuildRequires: gnupg2
Command line utility to control osbuild-composer Command line utility to control osbuild-composer
%prep %prep
%if %{with signed}
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
%endif
%if 0%{?rhel} %if 0%{?rhel}
%forgeautosetup -p1 %forgeautosetup -p1
%else %else
@ -121,6 +129,33 @@ composer-cli package.
%changelog %changelog
* Wed Aug 25 2021 Brian C. Lane <bcl@redhat.com> - 35.2-2
- gating: Add gating tests
Resolves: rhbz#1996788
- gating: Workaround to install latest packages
- Fix integration tests
* Mon Aug 23 2021 Brian C. Lane <bcl@redhat.com> - 35.2-1
- New release: 35.2 (bcl)
Resolves: rhbz#1996762
- weldr: Use assert.Contains instead of IsStringInSlice (bcl)
- Add missing projects depsolve command (bcl)
- Add support for projects info --distro=DISTRO-NAME (bcl)
- Add support for projects list --distro=DISTRO-NAME (bcl)
- Add support for modules info --distro=DISTRO-NAME (bcl)
- weldr: Add distros to testState (bcl)
- Add support for modules list --distro=DISTRO-NAME (bcl)
- weldr: Add AppendQuery helper function (bcl)
- Add support for compose types --distro=DISTRO-NAME (bcl)
- composer-cli: Add distros list command (bcl)
- weldr: Add ListDistros function and tests (bcl)
- Makefile: Add scratch-srpm and scratch-rpm targets (bcl)
- Print filename for compose results (bcl)
- ExcuteTests - return the correct error variables in case of errors (atodorov)
- The rpm package should obsolete composer-cli from lorax (bcl)
- tests: Enable CodeCov.io (atodorov)
- actions: Install lint using GOPATH (bcl)
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 35.1-4 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 35.1-4
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688 Related: rhbz#1991688