Compare commits

..

No commits in common. "rawhide" and "f40" have entirely different histories.

4 changed files with 17 additions and 67 deletions

6
.gitignore vendored
View file

@ -24,9 +24,3 @@
/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

View file

@ -1,48 +0,0 @@
From 6815aa4a2a0b2bd376d0f6e072580a9c60086e3e Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
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

View file

@ -1,3 +1,3 @@
SHA512 (weldr-client-36.1.tar.gz) = 52bac9879b73e3137d434a9c46a2914e0446ed63db14c9176cbd2a47aaf10a757a905a138401208958631237d354a7689035fd5a68297720431b212151eabd4d
SHA512 (weldr-client-36.1.tar.gz.asc) = 0d0fd65355356aaac2eb8052c182f619d8d7da5c6af164d7b3da97b2fc0b4435d6e4cff2b81914e99e8f094a518432dd0b769e28fba4c90b8a9453326d6b3f1a
SHA512 (gpg-117E8C168EFE3A7F.key) = cbbf218fe4427bd16f64b60cafd8c98bc3b073c25cfe2c19f03405ebfbf88ac05f0a3fa4e44afbbc514616b426008bc1e76b4e3ea49825a6ece4ad63638bb52b
SHA512 (weldr-client-35.13.tar.gz) = e74eb2e11c5598c79198c804f2638219ed22be3fb1cc10be51197fa6a7bc45ddd7b1f0dd58f1e757f454e0a7acaac7110bfec012a67374d13294073e60981c53
SHA512 (weldr-client-35.13.tar.gz.asc) = 432eaccd1626b1da29553afb070bea7c0f95c97fb82d060a67fcb35d018bfcc78c34eaebb9fbfb35c3615b921b77ea7d7af63c2df7ba9caf98593726944f206f
SHA512 (gpg-117E8C168EFE3A7F.key) = e02b3598d3ccdf58a7f34d0e3129f08126bc07cfb0ff98ac96f3325a7612e4e13e0adc09ea68e57f1198181e864e108c1aae718cdbb115326abefd50e969a4fe

View file

@ -6,7 +6,7 @@
%global goipath github.com/osbuild/weldr-client/v2
Name: weldr-client
Version: 36.1
Version: 35.13
Release: 1%{?dist}
# Upstream license specification: Apache-2.0
License: Apache-2.0
@ -130,12 +130,16 @@ composer-cli package.
%changelog
* Wed Oct 15 2025 Brian C. Lane <bcl@redhat.com> - 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)
* Thu Mar 07 2024 Brian C. Lane <bcl@redhat.com> - 35.13-1
- New release: 35.13 (bcl)
- HACKING.md: Reformat code blocks for docusaurus (simon.steinbeiss)
- README: Update code block formatting and drop subtitle (simon.steinbeiss)
- info: Add upload status to the output (bcl)
- info: Fix display of blueprint packages with no version (bcl)
- weldr: Add Stringer interface to Package (bcl)
- compose: Add --wait options to start-ostree (bcl)
- compose: Add --wait options to start command (bcl)
- compose: Add compose wait command (bcl)
- weldr: Add ComposeWait to wait for a compose to finish (bcl)
- build(deps): bump github.com/stretchr/testify from 1.8.4 to 1.9.0 (49699333+dependabot[bot])
- CI: Drop SonarQube in favor of Snyk (jrusz)