Skip to content

Commit

Permalink
tree: promote changes from testing-devel at 20e1222
Browse files Browse the repository at this point in the history
  • Loading branch information
dustymabe committed Nov 25, 2019
1 parent c11e08f commit 0d8e188
Show file tree
Hide file tree
Showing 28 changed files with 551 additions and 796 deletions.
4 changes: 2 additions & 2 deletions .cci.jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@Library('github.com/coreos/coreos-ci-lib@master') _

coreos.pod([image: "quay.io/coreos-assembler/coreos-assembler:latest", kvm: true]) {
coreos.pod([image: "quay.io/coreos-assembler/coreos-assembler:latest", kvm: true, memory: "9Gi"]) {
stage("Build") {
dir("fedora-coreos-config") {
checkout scm
Expand All @@ -15,7 +15,7 @@ coreos.pod([image: "quay.io/coreos-assembler/coreos-assembler:latest", kvm: true
stage("Kola") {
dir("cosa") {
coreos.shwrap("""
cosa kola run
cosa kola run -- --parallel 8
""")
}
}
Expand Down
17 changes: 17 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,20 @@ one easy way to do this is for now:
- add packages to the correct YAML manifest
- run `cosa fetch --update-lockfile`
- commit only the new package entries

## Moving to a new major version of Fedora

Updating this repo itself is easy:

1. bump `releasever` in `manifest.yaml`
2. update the repos in `manifest.yaml` if needed
3. run `cosa fetch --update-lockfile`
4. PR the result

Though there are also some releng-related knobs that may need changes:

1. verify that the `f${releasever}-coreos-signing-pending` Koji tag has
been created
2. update RoboSignatory config so that:
- [tagged packages are signed with the right key](https://infrastructure.fedoraproject.org/cgit/ansible.git/tree/roles/robosignatory/templates/robosignatory.toml.j2?id=c27f4644d4bc2f7916c9c85dc1c1a9ee9a724cc0#n181)
- [CoreOS artifacts are signed with the right key](https://infrastructure.fedoraproject.org/cgit/ansible.git/tree/roles/robosignatory/templates/robosignatory.toml.j2?id=c27f4644d4bc2f7916c9c85dc1c1a9ee9a724cc0#n458)
3 changes: 3 additions & 0 deletions image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ size: 8
extra-kargs:
# Disable SMT on systems vulnerable to MDS or any similar future issue.
- mitigations=auto,nosmt
# https://github.com/coreos/fedora-coreos-tracker/issues/292
# https://fedoraproject.org/wiki/Changes/CGroupsV2
- systemd.unified_cgroup_hierarchy=0


# Optional remote by which to prefix the deployed OSTree ref
Expand Down
6 changes: 6 additions & 0 deletions kola-blacklist.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# This file documents currently known-to-fail kola tests. It is consumed by
# coreos-assembler to automatically blacklist some tests. For more information,
# see: https://github.com/coreos/coreos-assembler/pull/866.

- pattern: fcos.python
tracker: https://github.com/coreos/mantle/issues/1103
24 changes: 3 additions & 21 deletions manifest-lock.overrides.x86_64.json
Original file line number Diff line number Diff line change
@@ -1,28 +1,10 @@
{
"packages": {
"ignition": {
"evra": "2.0.1-4.git641ec6a.fc30.x86_64"
"evra": "2.0.1-5.git641ec6a.fc31.x86_64"
},
"zincati": {
"evra": "0.0.5-1.module_f30+6699+1eaa40c6.x86_64"
},
"systemd": {
"evra": "241-12.git323cdf4.fc30.x86_64"
},
"systemd-container": {
"evra": "241-12.git323cdf4.fc30.x86_64"
},
"systemd-libs": {
"evra": "241-12.git323cdf4.fc30.x86_64"
},
"systemd-pam": {
"evra": "241-12.git323cdf4.fc30.x86_64"
},
"systemd-rpm-macros": {
"evra": "241-12.git323cdf4.fc30.noarch"
},
"systemd-udev": {
"evra": "241-12.git323cdf4.fc30.x86_64"
"nfs-utils-coreos": {
"evra": "1:2.4.1-2.rc1.fc31.x86_64"
}
}
}
Loading

0 comments on commit 0d8e188

Please sign in to comment.