diff --git a/.gitignore b/.gitignore index 04df71d..62ae47b 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,17 @@ /weldr-client-35.8.tar.gz.asc /weldr-client-35.9.tar.gz /weldr-client-35.9.tar.gz.asc +/weldr-client-35.10.tar.gz +/weldr-client-35.10.tar.gz.asc +/weldr-client-35.11.tar.gz +/weldr-client-35.11.tar.gz.asc +/weldr-client-35.12.tar.gz +/weldr-client-35.12.tar.gz.asc +/weldr-client-35.13.tar.gz +/weldr-client-35.13.tar.gz.asc +/weldr-client-35.14.tar.gz +/weldr-client-35.14.tar.gz.asc +/weldr-client-36.0.tar.gz +/weldr-client-36.0.tar.gz.asc +/weldr-client-36.1.tar.gz +/weldr-client-36.1.tar.gz.asc diff --git a/0001-tests-Skip-checking-arch-when-testing-sent-body.patch b/0001-tests-Skip-checking-arch-when-testing-sent-body.patch new file mode 100644 index 0000000..affb1aa --- /dev/null +++ b/0001-tests-Skip-checking-arch-when-testing-sent-body.patch @@ -0,0 +1,48 @@ +From 6815aa4a2a0b2bd376d0f6e072580a9c60086e3e Mon Sep 17 00:00:00 2001 +From: "Brian C. Lane" +Date: Thu, 14 Aug 2025 09:26:25 -0700 +Subject: [PATCH] tests: Skip checking arch when testing sent body + +The host architecture is included in the body of the request, skip +checking for the specific arch in order to keep the tests architecture +independent. + +Related: RHEL-60137 +--- + cmd/composer-cli/projects/info_test.go | 4 +++- + cmd/composer-cli/projects/list_test.go | 4 +++- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/cmd/composer-cli/projects/info_test.go b/cmd/composer-cli/projects/info_test.go +index 3f9a85f..dd2a78c 100644 +--- a/cmd/composer-cli/projects/info_test.go ++++ b/cmd/composer-cli/projects/info_test.go +@@ -457,7 +457,9 @@ func TestCmdProjectsInfoCloud(t *testing.T) { + sentBody, err := io.ReadAll(mcc.Req.Body) + assert.Nil(t, mcc.Req.Body.Close()) + require.Nil(t, err) +- assert.Contains(t, string(sentBody), `{"distribution":"homer","architecture":"x86_64","packages":["tmux"]}`) ++ // NOTE: sentBody also contains arch specific architecture, skip checking that. ++ assert.Contains(t, string(sentBody), `"distribution":"homer"`) ++ assert.Contains(t, string(sentBody), `"packages":["tmux"]`) + assert.Equal(t, "application/json", mcc.Req.Header.Get("Content-Type")) + assert.Equal(t, "/api/image-builder-composer/v2/search/packages", mcc.Req.URL.Path) + } +diff --git a/cmd/composer-cli/projects/list_test.go b/cmd/composer-cli/projects/list_test.go +index b809224..386b793 100644 +--- a/cmd/composer-cli/projects/list_test.go ++++ b/cmd/composer-cli/projects/list_test.go +@@ -363,7 +363,9 @@ func TestCmdProjectsListCloud(t *testing.T) { + sentBody, err := io.ReadAll(mcc.Req.Body) + assert.Nil(t, mcc.Req.Body.Close()) + require.Nil(t, err) +- assert.Contains(t, string(sentBody), `{"distribution":"homer","architecture":"x86_64","packages":["*"]}`) ++ // NOTE: sentBody also contains arch specific architecture, skip checking that. ++ assert.Contains(t, string(sentBody), `"distribution":"homer"`) ++ assert.Contains(t, string(sentBody), `"packages":["*"]`) + assert.Equal(t, "application/json", mcc.Req.Header.Get("Content-Type")) + assert.Equal(t, "/api/image-builder-composer/v2/search/packages", mcc.Req.URL.Path) + } +-- +2.50.1 + diff --git a/sources b/sources index 5429231..9a05ef2 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (weldr-client-35.9.tar.gz) = bf4a74bd601e9bf789961754488ca8522938c7b5807f0e2e01b53bb9ca4d8a21823fcb54bc4fb81b7299010f0c81a8d33daa2d9d1a2e0935d271536c3e417fcd -SHA512 (weldr-client-35.9.tar.gz.asc) = e5e8ddf7b99532dec856511e98b12ed985815dd9b42e4e8e8cfa2c2d7dd8eebd88acb9f164f9f339e072faca5a3ef8dfa5b4e14450dc04744d1a73274c7d4b30 -SHA512 (gpg-117E8C168EFE3A7F.key) = 88c0a30ebbaa3b586d5ac5fd5fdcf1f92f58ab580d7770e39ef9ff4ce380c1a748e815d3f9f9c13a6b2d1b1cd554886c360fba7a586f518a8aa7a4972317526b +SHA512 (weldr-client-36.1.tar.gz) = 52bac9879b73e3137d434a9c46a2914e0446ed63db14c9176cbd2a47aaf10a757a905a138401208958631237d354a7689035fd5a68297720431b212151eabd4d +SHA512 (weldr-client-36.1.tar.gz.asc) = 0d0fd65355356aaac2eb8052c182f619d8d7da5c6af164d7b3da97b2fc0b4435d6e4cff2b81914e99e8f094a518432dd0b769e28fba4c90b8a9453326d6b3f1a +SHA512 (gpg-117E8C168EFE3A7F.key) = cbbf218fe4427bd16f64b60cafd8c98bc3b073c25cfe2c19f03405ebfbf88ac05f0a3fa4e44afbbc514616b426008bc1e76b4e3ea49825a6ece4ad63638bb52b diff --git a/weldr-client.spec b/weldr-client.spec index b7803b9..82def08 100644 --- a/weldr-client.spec +++ b/weldr-client.spec @@ -6,10 +6,10 @@ %global goipath github.com/osbuild/weldr-client/v2 Name: weldr-client -Version: 35.9 -Release: 2%{?dist} +Version: 36.1 +Release: 1%{?dist} # Upstream license specification: Apache-2.0 -License: ASL 2.0 +License: Apache-2.0 Summary: Command line utility to control osbuild-composer %gometa @@ -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,23 +130,12 @@ composer-cli package. %changelog -* Sat Jan 21 2023 Fedora Release Engineering - 35.9-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Nov 30 2022 Brian C. Lane - 35.9-1 -- New release: 35.9 (bcl) -- 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) -- build(deps): bump github.com/BurntSushi/toml from 1.2.0 to 1.2.1 (49699333+dependabot[bot]) -- build(deps): bump github.com/stretchr/testify from 1.8.0 to 1.8.1 (49699333+dependabot[bot]) -- build(deps): bump github.com/spf13/cobra from 1.5.0 to 1.6.1 (49699333+dependabot[bot]) +* Wed Oct 15 2025 Brian C. Lane - 36.1-1 +- New release: 36.1 (bcl) +- build(deps): bump actions/setup-go from 5 to 6 (49699333+dependabot[bot]) +- build(deps): bump github.com/spf13/cobra from 1.9.1 to 1.10.1 (49699333+dependabot[bot]) +- test: iot-qcow2-image does not support packages (bcl) +- test: qcow2 renamed to server-qcow2 (bcl) +- build(deps): bump github.com/stretchr/testify from 1.10.0 to 1.11.1 (49699333+dependabot[bot]) +- build(deps): bump actions/checkout from 4 to 5 (49699333+dependabot[bot]) +- tests: Use current host arch in info and list tests (bcl) \ No newline at end of file