workstation-ostree-config

Clone
Source Code
GIT

#546 Rawhide is now f42
Merged 2 months ago by jnsamyak. Opened 2 months ago by jnsamyak.
jnsamyak/workstation-ostree-config new_rawhide  into  main

file modified
+12 -12 
@@ -162,13 +162,13 @@ 
 

  Using the `comps-sync.py` script, provide the updated input XML file to examine
 

  the changes as a dry-run:
 

  

- `$ ./comps-sync.py /path/to/fedora-comps/comps-f41.xml.in`
 

+ `$ ./comps-sync.py /path/to/fedora-comps/comps-f42.xml.in`
 

  

  Examine the changes and cross-reference them with PRs made to the `fedora-comps`
 

  repo. When you are satisfied that the changes are accurate and appear safe,
 

  re-run the script with the `--save` option:
 

  

- `$ ./comps-sync.py --save /path/to/fedora-comps/comps-f41.xml.in`
 

+ `$ ./comps-sync.py --save /path/to/fedora-comps/comps-f42.xml.in`
 

  

  Create a pull request with the changes and note any PRs from `fedora-comps`
 

  in the commit message that are relevant to the changes you have generated.
 
@@ -186,22 +186,22 @@ 
 

  ### On Rawhide / main branch
 

  

  ```
 

- sed -i "s/41/42/g" *.repo comps-sync.py
 

- sed -i "s/releasever: 41/releasever: 42/" common.yaml
 

- sed -i "s/# - fedora-41/# - fedora-42/" *.yaml
 

- mv fedora-41.repo fedora-42.repo
 

- mv fedora-41-updates.repo fedora-42-updates.repo
 

- sed -i "s/42/42/g" README.md
 

- sed -i "s/41/42/g" README.md
 

+ sed -i "s/42/43/g" *.repo comps-sync.py
 

+ sed -i "s/releasever: 42/releasever: 43/" common.yaml
 

+ sed -i "s/# - fedora-42/# - fedora-43/" *.yaml
 

+ mv fedora-42.repo fedora-43.repo
 

+ mv fedora-42-updates.repo fedora-43-updates.repo
 

+ sed -i "s/43/44/g" README.md
 

+ sed -i "s/42/43/g" README.md
 

  ```
 

  

- ### On the new branch (f41)
 

+ ### On the new branch (f42)
 

  

  ```
 

  rm fedora-rawhide.repo
 

  sed -i "/- fedora-rawhide/d" fedora-*.yaml
 

- sed -i "s/# - fedora-41/- fedora-41/" *.yaml
 

- sed -i "s/ref: fedora\/rawhide/ref: fedora\/41/" *.yaml
 

+ sed -i "s/# - fedora-42/- fedora-42/" *.yaml
 

+ sed -i "s/ref: fedora\/rawhide/ref: fedora\/42/" *.yaml
 

  ```
 

  

  ## Historical references

file modified
+2 -2 
@@ -24,5 +24,5 @@ 
 

  # Kept in the leaf manifest as they are overwritten by Pungi in composes
 

  repos:
 

    - fedora-rawhide
 

-   # - fedora-41
 

-   # - fedora-41-updates
 

+   # - fedora-42
 

+   # - fedora-42-updates

file modified
+2 -2 
@@ -7,5 +7,5 @@ 
 

  # Kept in the leaf manifest as they are overwritten by Pungi in composes
 

  repos:
 

    - fedora-rawhide
 

-   # - fedora-41
 

-   # - fedora-41-updates
 

+   # - fedora-42
 

+   # - fedora-42-updates

file modified
+2 -2 
@@ -7,5 +7,5 @@ 
 

  # Kept in the leaf manifest as they are overwritten by Pungi in composes
 

  repos:
 

    - fedora-rawhide
 

-   # - fedora-41
 

-   # - fedora-41-updates
 

+   # - fedora-42
 

+   # - fedora-42-updates

file modified
+2 -2 
@@ -21,5 +21,5 @@ 
 

  # Kept in the leaf manifest as they are overwritten by Pungi in composes
 

  repos:
 

    - fedora-rawhide
 

-   # - fedora-41
 

-   # - fedora-41-updates
 

+   # - fedora-42
 

+   # - fedora-42-updates

file modified
+1 -1 
@@ -1,4 +1,4 @@ 
 

- releasever: 41
 

+ releasever: 42
 

  automatic-version-prefix: "${releasever}.<date:%Y%m%d>"
 

  mutate-os-release: "${releasever}"

file modified
+1 -1 
@@ -1,7 +1,7 @@ 
 

  #!/usr/bin/python3
 

  

  '''
 

- Usage: ./comps-sync.py [--save] /path/to/comps-f41.xml.in
 

+ Usage: ./comps-sync.py [--save] /path/to/comps-f42.xml.in
 

  

  Filter and sync packages from comps groups into rpm-ostree manifests. The sync
 

  will remove packages from the manifests which are not mentioned in comps and

file modified
+2 -2 
@@ -22,5 +22,5 @@ 
 

  # Kept in the leaf manifest as they are overwritten by Pungi in composes
 

  repos:
 

    - fedora-rawhide
 

-   # - fedora-41
 

-   # - fedora-41-updates
 

+   # - fedora-42
 

+   # - fedora-42-updates

fedora-42-updates.repo fedora-41-updates.repo
file renamed
+3 -3 
@@ -1,6 +1,6 @@ 
 

- [fedora-41-updates]
 

- name=Fedora 41 $basearch Updates
 

- mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f41&arch=$basearch
 

+ [fedora-42-updates]
 

+ name=Fedora 42 $basearch Updates
 

+ mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f42&arch=$basearch
 

  enabled=1
 

  gpgcheck=1
 

  metadata_expire=1d

fedora-42.repo fedora-41.repo
file renamed
+3 -3 
@@ -1,6 +1,6 @@ 
 

- [fedora-41]
 

- name=Fedora 41 $basearch
 

- mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-41&arch=$basearch
 

+ [fedora-42]
 

+ name=Fedora 42 $basearch
 

+ mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-42&arch=$basearch
 

  enabled=1
 

  gpgcheck=1
 

  metadata_expire=1d

file added
+11 
@@ -0,0 +1,11 @@ 
 

+ variables:
 

+   bootable_container: false
 

+ 

+ include:
 

+   - kinoite-common.yaml
 

+ 

+ # Kept in the leaf manifest as they are overwritten by Pungi in composes
 

+ repos:
 

+   - fedora-rawhide
 

+   # - fedora-42
 

+   # - fedora-42-updates

file removed
-1 
@@ -1,1 +0,0 @@ 
 

- kinoite-ostree.yaml 

\ No newline at end of file

file added
+11 
@@ -0,0 +1,11 @@ 
 

+ variables:
 

+   bootable_container: false
 

+ 

+ include:
 

+   - budgie-atomic-common.yaml
 

+ 

+ # Kept in the leaf manifest as they are overwritten by Pungi in composes
 

+ repos:
 

+   - fedora-rawhide
 

+   # - fedora-42
 

+   # - fedora-42-updates

file removed
-1 
@@ -1,1 +0,0 @@ 
 

- budgie-atomic-ostree.yaml 

\ No newline at end of file

file added
+11 
@@ -0,0 +1,11 @@ 
 

+ variables:
 

+   bootable_container: false
 

+ 

+ include:
 

+   - sway-atomic-common.yaml
 

+ 

+ # Kept in the leaf manifest as they are overwritten by Pungi in composes
 

+ repos:
 

+   - fedora-rawhide
 

+   # - fedora-42
 

+   # - fedora-42-updates

file removed
-1 
@@ -1,1 +0,0 @@ 
 

- sway-atomic-ostree.yaml 

\ No newline at end of file

file added
+11 
@@ -0,0 +1,11 @@ 
 

+ variables:
 

+   bootable_container: false
 

+ 

+ include:
 

+   - silverblue-common.yaml
 

+ 

+ # Kept in the leaf manifest as they are overwritten by Pungi in composes
 

+ repos:
 

+   - fedora-rawhide
 

+   # - fedora-42
 

+   # - fedora-42-updates

file removed
-1 
@@ -1,1 +0,0 @@ 
 

- silverblue-ostree.yaml 

\ No newline at end of file

file modified
+2 -2 
@@ -46,5 +46,5 @@ 
 

  # Kept in the leaf manifest as they are overwritten by Pungi in composes
 

  repos:
 

    - fedora-rawhide
 

-   # - fedora-41
 

-   # - fedora-41-updates
 

+   # - fedora-42
 

+   # - fedora-42-updates

file modified
+2 -2 
@@ -7,5 +7,5 @@ 
 

  # Kept in the leaf manifest as they are overwritten by Pungi in composes
 

  repos:
 

    - fedora-rawhide
 

-   # - fedora-41
 

-   # - fedora-41-updates
 

+   # - fedora-42
 

+   # - fedora-42-updates

file modified
+2 -2 
@@ -7,5 +7,5 @@ 
 

  # Kept in the leaf manifest as they are overwritten by Pungi in composes
 

  repos:
 

    - fedora-rawhide
 

-   # - fedora-41
 

-   # - fedora-41-updates
 

+   # - fedora-42
 

+   # - fedora-42-updates

file modified
+2 -2 
@@ -26,5 +26,5 @@ 
 

  # Kept in the leaf manifest as they are overwritten by Pungi in composes
 

  repos:
 

    - fedora-rawhide
 

-   # - fedora-41
 

-   # - fedora-41-updates
 

+   # - fedora-42
 

+   # - fedora-42-updates

file modified
+2 -2 
@@ -24,5 +24,5 @@ 
 

  # Kept in the leaf manifest as they are overwritten by Pungi in composes
 

  repos:
 

    - fedora-rawhide
 

-   # - fedora-41
 

-   # - fedora-41-updates
 

+   # - fedora-42
 

+   # - fedora-42-updates

file modified
+2 -2 
@@ -7,5 +7,5 @@ 
 

  # Kept in the leaf manifest as they are overwritten by Pungi in composes
 

  repos:
 

    - fedora-rawhide
 

-   # - fedora-41
 

-   # - fedora-41-updates
 

+   # - fedora-42
 

+   # - fedora-42-updates

file modified
+2 -2 
@@ -7,5 +7,5 @@ 
 

  # Kept in the leaf manifest as they are overwritten by Pungi in composes
 

  repos:
 

    - fedora-rawhide
 

-   # - fedora-41
 

-   # - fedora-41-updates
 

+   # - fedora-42
 

+   # - fedora-42-updates

file modified
+2 -2 
@@ -7,5 +7,5 @@ 
 

  # Kept in the leaf manifest as they are overwritten by Pungi in composes
 

  repos:
 

    - fedora-rawhide
 

-   # - fedora-41
 

-   # - fedora-41-updates
 

+   # - fedora-42
 

+   # - fedora-42-updates

file modified
+2 -2 
@@ -7,5 +7,5 @@ 
 

  # Kept in the leaf manifest as they are overwritten by Pungi in composes
 

  repos:
 

    - fedora-rawhide
 

-   # - fedora-41
 

-   # - fedora-41-updates
 

+   # - fedora-42
 

+   # - fedora-42-updates

file modified
+2 -2 
@@ -22,5 +22,5 @@ 
 

  # Kept in the leaf manifest as they are overwritten by Pungi in composes
 

  repos:
 

    - fedora-rawhide
 

-   # - fedora-41
 

-   # - fedora-41-updates
 

+   # - fedora-42
 

+   # - fedora-42-updates

Signed-off-by: Samyak Jain samyak.jn11@gmail.com

This should not be merged before August 13, but it is open for review.

CC: @siosm (thanks for the readme <3)

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/abb3ab5a08f641588ab928e22886773a

The ci failure is because this depends on the comps change to land before it can validate.

There's a lot of changing of things in comments here. I guess thats so next branching we can copy this and just have to adjust comments, but perhaps we should consider just dropping those commented fedora-Nwhatever's here and just add them all in the branch when we make it?

I guess it's a perference, we could just keep doing this. Otherwise it looks good to me. +1

Pull-Request has been merged by jnsamyak
2 months ago

This broke all the symlinks as I had missed adding --follow-symlinks to the sed calls.

I'll make a fixup PR.
Metadata
None
No Tags
Changes Summary 28
+12 -12
file changed
README.md
+2 -2
file changed
base-atomic.yaml
+2 -2
file changed
budgie-atomic-ostree.yaml
+2 -2
file changed
budgie-atomic.yaml
+2 -2
file changed
cinnamon-atomic.yaml
+1 -1
file changed
common.yaml
+1 -1
file changed
comps-sync.py
+2 -2
file changed
deepin-atomic.yaml
+3 -3
file renamed
fedora-41-updates.repo
fedora-42-updates.repo
+3 -3
file renamed
fedora-41.repo
fedora-42.repo
+11
file added
fedora-kinoite.yaml
-1
file removed
fedora-kinoite.yaml
+11
file added
fedora-onyx.yaml
-1
file removed
fedora-onyx.yaml
+11
file added
fedora-sericea.yaml
-1
file removed
fedora-sericea.yaml
+11
file added
fedora-silverblue.yaml
-1
file removed
fedora-silverblue.yaml
+2 -2
file changed
kinoite-mobile.yaml
+2 -2
file changed
kinoite-ostree.yaml
+2 -2
file changed
kinoite.yaml
+2 -2
file changed
lxqt-atomic.yaml
+2 -2
file changed
mate-atomic.yaml
+2 -2
file changed
silverblue-ostree.yaml
+2 -2
file changed
silverblue.yaml
+2 -2
file changed
sway-atomic-ostree.yaml
+2 -2
file changed
sway-atomic.yaml
+2 -2
file changed
xfce-atomic.yaml
Powered by Pagure 5.14.1
Documentation • File an Issue • About • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.