From 02c426dc9c4728ae24137bd4cc752e61071f518d Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: May 16 2023 06:05:40 +0000 Subject: import weldr-client-35.9-2.el8 --- diff --git a/.gitignore b/.gitignore index b1eca1a..90f335b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ SOURCES/gpg-117E8C168EFE3A7F.key -SOURCES/weldr-client-35.5.tar.gz +SOURCES/weldr-client-35.9.tar.gz diff --git a/.weldr-client.metadata b/.weldr-client.metadata index dbe2dd5..15a9d75 100644 --- a/.weldr-client.metadata +++ b/.weldr-client.metadata @@ -1,2 +1,2 @@ -9a95f2c777b4fca2c9c5705ed330cafcf1b09555 SOURCES/gpg-117E8C168EFE3A7F.key -089128c30d8aa218304d0bb8d571f9a6d45aba72 SOURCES/weldr-client-35.5.tar.gz +1a9f7bdb8023dd28983a4ada5ad2d00c1fdd75fd SOURCES/gpg-117E8C168EFE3A7F.key +11ab0aab62950b19a07ec165e334b0b305f99606 SOURCES/weldr-client-35.9.tar.gz diff --git a/SOURCES/0001-tests-Update-tests-for-osbuild-composer-changes.patch b/SOURCES/0001-tests-Update-tests-for-osbuild-composer-changes.patch deleted file mode 100644 index d0d61eb..0000000 --- a/SOURCES/0001-tests-Update-tests-for-osbuild-composer-changes.patch +++ /dev/null @@ -1,47 +0,0 @@ -From b1d63edcd830a5a23eaa838f536769681db24acb Mon Sep 17 00:00:00 2001 -From: "Brian C. Lane" -Date: Tue, 14 Jun 2022 13:43:45 -0700 -Subject: [PATCH] tests: Update tests for osbuild-composer changes - -Cancel when the build is in the wrong state now returns a proper error, -and ostree composes now accept the refid, parent, and the url without -returning an error. ---- - weldr/compose_test.go | 12 +++++------- - 1 file changed, 5 insertions(+), 7 deletions(-) - -diff --git a/weldr/compose_test.go b/weldr/compose_test.go -index f937510..fb2fa42 100644 ---- a/weldr/compose_test.go -+++ b/weldr/compose_test.go -@@ -97,14 +97,12 @@ func TestStartOSTreeComposeUrl(t *testing.T) { - assert.Greater(t, len(id), 0) - } - --func TestStartOSTreeComposeUrlError(t *testing.T) { -- // Sending both the parent url and the parent id should return an error -+func TestStartOSTreeUrlParentError(t *testing.T) { -+ // Sending both the parent url and the parent id is now allowed - id, r, err := testState.client.StartOSTreeComposeTest("cli-test-bp-1", "qcow2", "refid", "parent", "http://weldr.io", 0, 2) - require.Nil(t, err) -- require.NotNil(t, r) -- assert.False(t, r.Status) -- assert.Equal(t, APIErrorMsg{"OSTreeOptionsError", "Supply at most one of Parent and URL"}, r.Errors[0]) -- assert.Equal(t, len(id), 0) -+ require.Nil(t, r) -+ assert.Greater(t, len(id), 0) - } - - func TestStartOSTreeComposeUpload(t *testing.T) { -@@ -196,7 +194,7 @@ func TestCancelFinishedCompose(t *testing.T) { - require.NotNil(t, status) - assert.False(t, status.Status) - require.GreaterOrEqual(t, len(r), 1) -- assert.Equal(t, APIErrorMsg{"InternalServerError", "Internal server error: job does not exist"}, r[0]) -+ assert.Equal(t, APIErrorMsg{"BuildInWrongState", fmt.Sprintf("Build %s is not in WAITING or RUNNING.", id)}, r[0]) - } - - func TestCancelComposeUnknown(t *testing.T) { --- -2.37.1 - diff --git a/SOURCES/weldr-client-35.5.tar.gz.asc b/SOURCES/weldr-client-35.5.tar.gz.asc deleted file mode 100644 index f3bfd06..0000000 --- a/SOURCES/weldr-client-35.5.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEEtMa0UeT6i0IyyhkeEX6MFo7+On8FAmIK0YcACgkQEX6MFo7+ -On8CfAf7BSNtG3oQKc9KxmN+D7hS/IHliKpAWRhF+kNZDshytLZeISuB8yjDlXJ8 -LMVifzmkumoZTwYsk74TGJjL/j/wTo6RAE5+OEIQIftvidihahNUH5WM6XrbSVAA -ygB3NgrhaGTnk8TRHNNnY26CJ6drY6MTNB3V+JFXtVlx/EgH+LHHLrXOA6f5I+3h -TKMzxJOXgXb1yDrSdVJYj1IToGmwT+QsiCmzciYCykshRaoe9hGfrDPoC4xGjdVx -OreX9x/tmPuPqQhXK40CqVX2rGMzjMf78/01dDiWHatOKepHdGy0N7VFwLQ8/f0Q -QD0Yq3i0JMzzS28NAszNdQdIeAD7BA== -=A1hY ------END PGP SIGNATURE----- diff --git a/SOURCES/weldr-client-35.9.tar.gz.asc b/SOURCES/weldr-client-35.9.tar.gz.asc new file mode 100644 index 0000000..ae1afc8 --- /dev/null +++ b/SOURCES/weldr-client-35.9.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEEtMa0UeT6i0IyyhkeEX6MFo7+On8FAmOH8DIACgkQEX6MFo7+ +On+AEwf/eC3Z8D+sYELGNptxRkCzPfVM24a0R6UBs0EWsc2Wj+4WfNF5KYURyhzT +u613oOINB70PFKGNy6WPvNVwjfbS0xvkff9e1Dsn/gXmmre/eLoEiAk1cSwRVAtu +lTmIsntUcQkqdBYSLG1ExGirrLPE79FshOzQC7wWprhYlm3lfMmAbJnX3wDd7YJJ +woX6boJAlfLyvYUQ5EGTLz2QBH61MqlVbB7O+r4ek7g252JsG0qSzIj9GShrJ6TK +skR/4GGHAoGp1wuuMAO8N6E+aXA2QmAGBDO7AdzAZC86U4BVe2xDvO63QwxiT5eN +ECRXCsisiALG1wJYGGnqh9Sc6bxNWw== +=uGwQ +-----END PGP SIGNATURE----- diff --git a/SPECS/weldr-client.spec b/SPECS/weldr-client.spec index c40d307..7b4aaf7 100644 --- a/SPECS/weldr-client.spec +++ b/SPECS/weldr-client.spec @@ -6,11 +6,13 @@ %global goipath github.com/osbuild/weldr-client/v2 Name: weldr-client -Version: 35.5 -Release: 4%{?dist} +Version: 35.9 +Release: 2%{?dist} # Upstream license specification: Apache-2.0 License: ASL 2.0 Summary: Command line utility to control osbuild-composer + +%gometa Url: %{gourl} Source0: https://github.com/osbuild/weldr-client/releases/download/v%{version}/%{name}-%{version}.tar.gz %if %{with signed} @@ -18,12 +20,10 @@ Source1: https://github.com/osbuild/weldr-client/releases/download/v%{version} Source2: https://keys.openpgp.org/vks/v1/by-fingerprint/117E8C168EFE3A7F#/gpg-117E8C168EFE3A7F.key %endif -Patch0001: 0001-tests-Update-tests-for-osbuild-composer-changes.patch - Obsoletes: composer-cli < 35.0 Provides: composer-cli = %{version}-%{release} -%gometa +Requires: diffutils BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} %if 0%{?fedora} @@ -117,6 +117,8 @@ make test %package tests Summary: Integration tests for composer-cli +Requires: createrepo_c + %description tests Integration tests to be run on a pristine-dedicated system to test the composer-cli package. @@ -128,6 +130,67 @@ composer-cli package. %changelog +* Tue Feb 14 2023 Brian C. Lane - 35.9-2 +- tests: Remove default repos before running tests + Related: rhbz#2168666 + +* Wed Nov 30 2022 Brian C. Lane - 35.9-1 +- Copy rhel-88.json test repository from osbuild-composer +- Update osbuild-composer test repositories from osbuild-composer +- New release: 35.9 (bcl) + Resolves: rhbz#2168666 +- tests: Replace os.MkdirTemp with t.TempDir (bcl) +- blueprint save: Allow overriding bad blueprint names (bcl) +- tests: Clean up checking err in tests (bcl) +- composer-cli: Implement blueprints diff (bcl) +- saveBlueprint: Return the filename to the caller (bcl) +- composer-cli: Add tests for using --commit with old servers (bcl) +- weldr: Return error about the blueprints change route (bcl) +- weldr: Save the http status code as part of APIResponse (bcl) +- Add --commit support to blueprints save (bcl) +- Add --commit to blueprints show (bcl) +- gitleaks: Exclude the test password used in tests (bcl) +- ci: add tags to AWS instances (tlavocat) +- Update github.com/BurntSushi/toml to 1.2.1 +- Update github.com/stretchr/testify to 1.8.1 +- Update bump github.com/spf13/cobra to 1.6.1 +- New release: 35.8 (bcl) +- completion: Remove providers from bash completion script (bcl) +- completion: Filter out new headers from compose list (bcl) +- docs: Remove unneeded Long descriptions (bcl) +- docs: Use a custom help template (bcl) +- docs: Add more command documentation (bcl) +- cmdline: Add package glob support to modules list command (bcl) +- workflow: Add govulncheck on go v1.18 (bcl) +- tests: Update to use golangci-lint 1.49.0 (bcl) +- New release: 35.7 (bcl) +- spec: Move %%gometa macro above %%gourl (bcl) +- weldr: When starting a compose pass size as bytes, not MiB (bcl) +- tests: Use correct size value in bytes for test (bcl) +- workflow: Add Go 1.18 to text matrix (bcl) +- Replace deprecated ioutil functions (bcl) +- New release: 35.6 (bcl) +- tests: Update tests for osbuild-composer changes (bcl) +- CMD: Compose status format (eloy.coto) +- CMD: Compose list format (eloy.coto) +- tests: Update tests to check for JSON list output (bcl) +- composer-cli: Change JSON output to be a list of objects (bcl) +- weldr: Simplify the old ComposeLog, etc. functions (bcl) +- composer-cli: Add --filename to blueprints freeze save command (bcl) +- composer-cli: Add --filename to blueprints save command (bcl) +- composer-cli: Add --filename to compose logs command (bcl) +- composer-cli: Add --filename to compose image command (bcl) +- composer-cli: Add --filename to compose metadata command (bcl) +- composer-cli: Add --filename to compose results command (bcl) +- weldr: Add saving to a new filename to GetFilePath function (bcl) +- github: Fix issue with codecov and forced pushes in PRs (bcl) +- Use golangci-lint 1.45.2 in workflow (bcl) +- Run workflow tests for go 1.16.x and 1.17.x (bcl) +- Move go.mod to go 1.16 (bcl) +- workflows/trigger-gitlab: run Gitlab CI in new image-builder project (jrusz) +- Update GitHub actions/setup-go to 3 +- Update GitHub actions/checkout to 3 + * Tue Aug 16 2022 Brian C. Lane - 35.5-4 - tests: Update tests for osbuild composer changes Resolves: rhbz#2118829