Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[testing] tree: promote changes from next at 1a3b193 #2710

Merged
merged 3 commits into from
Nov 3, 2023

Conversation

dustymabe
Copy link
Member

No description provided.

"evra": "1.10-1.fc38.x86_64"
"evra": "1.11-1.fc39.x86_64"
},
"crun-wasm": {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note since we promoted the wasm packages end up in the lockfiles, but since #2690 hasn't merged these packages won't be included when this is built. It's harmless to leave them in the lockfiles.

jlebon
jlebon previously approved these changes Nov 3, 2023
"evra": "5.2.15-3.fc38.x86_64"
"evra": "5.2.15-5.fc39.x86_64"
},
"bash-color-prompt": {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Part of Fedora Change.

"evra": "1.10-1.fc38.x86_64"
"evra": "1.11-1.fc39.x86_64"
},
"crun-wasm": {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Came in with the wasm stuff; should get dropped in the next lockfile bump.

"evra": "1.15.4-1.fc38.x86_64"
"evra": "1.15.4-3.fc39.x86_64"
},
"fmt": {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Came in with the wasm stuff; should get dropped in the next lockfile bump.

},
"fedora-repos-archive": {
"evra": "38-1.noarch"
},
"fedora-repos-modular": {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fedora 39 drops modularity.

},
"libunistring": {
"evra": "1.1-3.fc38.x86_64"
},
"libunistring1.0": {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dropped transitive dep of... NetworkManager I think?

"evra": "1.7.4.4-2.fc38.x86_64"
"evra": "1.7.4.4-3.fc39.x86_64"
},
"spdlog": {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Came in with the wasm stuff; should get dropped in the next lockfile bump.

"evra": "2:9.0.2048-1.fc38.x86_64"
"evra": "2:9.0.2048-1.fc39.x86_64"
},
"wasmedge-rt": {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Came in with the wasm stuff; should get dropped in the next lockfile bump.

@jlebon
Copy link
Member

jlebon commented Nov 3, 2023

Kola is failing on

[2023-11-03T15:39:31.909Z] Nov 03 15:39:27 qemu0 kola-runext-package[2106]: error: Could not depsolve transaction; 1 problem detected:
[2023-11-03T15:39:31.909Z] Nov 03 15:39:27 qemu0 kola-runext-package[2106]:  Problem: package vim-common-2:9.0.1927-1.fc39.x86_64 from fedora requires vim-data = 2:9.0.1927-1.fc39, but none of the providers can be installed
[2023-11-03T15:39:31.909Z] Nov 03 15:39:27 qemu0 kola-runext-package[2106]:   - cannot install both vim-data-2:9.0.1927-1.fc39.noarch from fedora and vim-data-2:9.0.2048-1.fc39.noarch from @System
[2023-11-03T15:39:31.909Z] Nov 03 15:39:27 qemu0 kola-runext-package[2106]:   - package vim-enhanced-2:9.0.1927-1.fc39.x86_64 from fedora requires vim-common = 2:9.0.1927-1.fc39, but none of the providers can be installed
[2023-11-03T15:39:31.909Z] Nov 03 15:39:27 qemu0 kola-runext-package[2106]:   - conflicting requests

which is because we don't have the updates-archive repo functioning yet for f39.

For now, we'll just denylist this test.

This is failing because the archive repo isn't active for F39 yet
and the version of VIM in the base layer is different than the versions
of packages that can be found in repos. Layering of vim packages is
disabled on next* streams for exactly this reason.

Adding it to the denylist for now. It will get removed in the next
promotion.
@dustymabe dustymabe enabled auto-merge (rebase) November 3, 2023 16:36
@jlebon
Copy link
Member

jlebon commented Nov 3, 2023

I'm not sure why "Check promotion diffs" is failing (looks like git fetch hitting infra issues maybe?), but I've manually checked that the diff against next is correct:

diff --git a/kola-denylist.yaml b/kola-denylist.yaml
index 5947988a..ab9a8292 100644
--- a/kola-denylist.yaml
+++ b/kola-denylist.yaml
@@ -35,3 +35,5 @@
     - ppc64le
   streams:
     - rawhide
+- pattern: ext.config.extensions.package
+  tracker: https://github.com/coreos/fedora-coreos-config/pull/2710#issuecomment-1792771307
diff --git a/manifest.yaml b/manifest.yaml
index ae5a10af..d3c24364 100644
--- a/manifest.yaml
+++ b/manifest.yaml
@@ -1,15 +1,7 @@
 variables:
-  stream: next
+  stream: testing
   prod: true
 
 releasever: 39
 
 include: manifests/fedora-coreos.yaml
-
-conditional-include:
-  # we only want these in next for now; see
-  # https://github.com/coreos/fedora-coreos-tracker/issues/1375
-  - if: basearch == "x86_64"
-    include: manifests/crun-wasm.yaml
-  - if: basearch == "aarch64"
-    include: manifests/crun-wasm.yaml

@jlebon jlebon merged commit 7e2d1e4 into coreos:testing Nov 3, 2023
1 of 2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants