Merge branch 'c9' into a9

This commit is contained in:
eabdullin 2023-12-13 12:35:27 +03:00
commit bf97dc16cc
4 changed files with 6 additions and 47 deletions

2
.gitignore vendored
View File

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

View File

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

View File

@ -1,37 +0,0 @@
diff -aruN osbuild-composer-88.1/internal/client/blueprints_test.go osbuild-composer-88.1.alma/internal/client/blueprints_test.go
--- osbuild-composer-88.1/internal/client/blueprints_test.go 2023-09-19 21:47:56
+++ osbuild-composer-88.1.alma/internal/client/blueprints_test.go 2023-11-07 17:26:20
@@ -12,10 +12,7 @@
import (
"encoding/json"
- "fmt"
- "os/exec"
"sort"
- "strconv"
"strings"
"testing"
@@ -1107,22 +1104,6 @@
func TestBlueprintFreezeGlobsV0(t *testing.T) {
// Test needs real packages, skip it for unit testing
if testState.unitTest {
- 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()
}

View File

@ -9,7 +9,7 @@
%global goipath github.com/osbuild/osbuild-composer %global goipath github.com/osbuild/osbuild-composer
Version: 88.1 Version: 88.2
%gometa %gometa
@ -33,10 +33,6 @@ License: Apache-2.0
URL: %{gourl} URL: %{gourl}
Source0: %{gosource} Source0: %{gosource}
# Patches were taken from:
# and reverted from https://github.com/osbuild/osbuild-composer/commit/eb5dd8ae1b5fb9142ecd89e3d4202b4a3b661545
Patch0: revert-Conditionally-skip-test-based-on-osbuild-compose.patch
Patch100: almalinux_support.patch Patch100: almalinux_support.patch
@ -405,12 +401,12 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
%endif %endif
%changelog %changelog
* Tue Nov 07 2023 Eduard Abdullin <eabdullin@almalinux.org> - 88.1-1.alma.1 * Wed Dec 13 2023 Eduard Abdullin <eabdullin@almalinux.org> - 88.2-1.alma.1
- Install AlmaLinux repositories - Install AlmaLinux repositories
- Add AlmaLinux support - Add AlmaLinux support
* Tue Nov 07 2023 Eduard Abdullin <eabdullin@almalinux.org> - 88.1-1 * Wed Dec 13 2023 Eduard Abdullin <eabdullin@almalinux.org> - 88.2-1
- Update to 88.1 - New upstream release
* Thu Aug 24 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 88-1 * Thu Aug 24 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 88-1
- New upstream release - New upstream release