import osbuild-composer-88.2-1.el9_3

i9-beta
MSVSphere Packaging Team 1 year ago committed by tigro
parent a4bed860d5
commit 9ff61ad0fd
Signed by: tigro
GPG Key ID: 1EC08A25C9DB2503

2
.gitignore vendored

@ -1 +1 @@
SOURCES/osbuild-composer-88.1.tar.gz
SOURCES/osbuild-composer-88.2.tar.gz

@ -1 +1 @@
6f828e8be7795f958ba9a20642e68a0f7d2a5646 SOURCES/osbuild-composer-88.1.tar.gz
a8cadabdb422de148aa9a375631e1ef32b52afaa SOURCES/osbuild-composer-88.2.tar.gz

@ -1,51 +0,0 @@
From 21f96abd61be2d10ea9543d137eb51f7ae6c769f Mon Sep 17 00:00:00 2001
From: Achilleas Koutsou <achilleas@koutsou.net>
Date: Wed, 20 Sep 2023 14:30:36 +0200
Subject: [PATCH] test: remove package version check
Package version parsing fails on minor releases (88.1).
---
internal/client/blueprints_test.go | 19 -------------------
1 file changed, 19 deletions(-)
diff --git a/internal/client/blueprints_test.go b/internal/client/blueprints_test.go
index 8cfa9a7be..c1c89d36e 100644
--- a/internal/client/blueprints_test.go
+++ b/internal/client/blueprints_test.go
@@ -12,10 +12,7 @@ package client
import (
"encoding/json"
- "fmt"
- "os/exec"
"sort"
- "strconv"
"strings"
"testing"
@@ -1110,22 +1107,6 @@ func TestBlueprintFreezeGlobsV0(t *testing.T) {
t.Skip()
}
- // works with osbuild-composer v83 and later
- rpm_q := exec.Command("rpm", "-q", "--qf", "%{version}", "osbuild-composer")
- out, err := rpm_q.CombinedOutput()
- if err != nil {
- assert.Fail(t, fmt.Sprintf("Error during rpm -q: %s", err))
- }
-
- rpm_version, err := strconv.Atoi(string(out))
- if err != nil {
- assert.Fail(t, "Error during str-int conversion", err)
- }
-
- if rpm_version < 83 {
- t.Skip()
- }
-
bp := `{
"name": "test-freeze-blueprint-glob-v0",
"description": "TestBlueprintFreezeGlobsV0",
--
2.42.0

@ -9,7 +9,7 @@
%global goipath github.com/osbuild/osbuild-composer
Version: 88.1
Version: 88.2
%gometa
@ -433,6 +433,9 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
%endif
%changelog
* Tue Oct 24 2023 Achilleas Koutsou <achilleas@redhat.com> - 88.2-1.inferit
- New upstream release
* Tue Oct 10 2023 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 88.1-1.inferit
- MSVSphere 9.2 and 9.3 support
- Rebuilt for MSVSphere 9.3

Loading…
Cancel
Save