search

CentOS / sig-atomic-buildscripts

73 stars 65 forks source link

cleanup the manifest; bring it up to date with the rest of AH streams #340

Closed miabbott closed 6 years ago

miabbott commented 6 years ago

I was going through some of the CAHC i-s-t results and found a number of differences in the package set that I think should be corrected.

This brings in the firewalld and podman packages, most notably. Additionally, I cleaned up some of the repos that were being used during the compose to point to the right locations where updated packages are landing.

After making these changes, a test compose generated the following diff from a relatively recent CAHC compose:

# rpm-ostree rebase custom:                                                                                                                                                            
Rebasing to custom:centos-atomic-host/7/x86_64/devel/continuous
26 metadata, 48 content objects fetched; 156539 KiB transferred in 3 seconds                                                                                                                                      
Copying /etc changes: 23 modified, 4 removed, 45 added
Transaction complete; bootconfig swap: yes; deployment count change: 1
Freed: 217.3 MB (pkgcache branches: 0)
Upgraded:
  cockpit-ostree 155-1.el7.centos -> 165-3.el7.centos
  rpm-ostree 2018.5.58-77e2e19c1f1fb38b08a10a1e8257f9d82e9f00e8.48080d8ef7b35dd36c3f601d06e7c9fc4d54e1e1.el7.centos -> 2018.5.59-c84b8b81db5241b83a1d6e5e7cddd7e27e88f722.48080d8ef7b35dd36c3f601d06e7c9fc4d54e1e1.el7.centos
  rpm-ostree-libs 2018.5.58-77e2e19c1f1fb38b08a10a1e8257f9d82e9f00e8.48080d8ef7b35dd36c3f601d06e7c9fc4d54e1e1.el7.centos -> 2018.5.59-c84b8b81db5241b83a1d6e5e7cddd7e27e88f722.48080d8ef7b35dd36c3f601d06e7c9fc4d54e1e1.el7.centos
Added:
  atomic-registries-1:1.22.1-23.git5a342e3.el7.x86_64
  containernetworking-plugins-0.7.0-101.el7.x86_64
  ebtables-2.0.10-16.el7.x86_64
  firewalld-0.4.4.4-14.el7.noarch
  firewalld-filesystem-0.4.4.4-14.el7.noarch
  ipset-6.29-1.el7.x86_64
  ipset-libs-6.29-1.el7.x86_64
  podman-0.6.4-1.gitd5beb2f.el7.x86_64
  python-firewall-0.4.4.4-14.el7.noarch
  python2-pytoml-0.1.14-2.git7dea353.el7.noarch
Run "systemctl reboot" to start a reboot
miabbott commented 6 years ago

@jlebon @cgwalters WDYT?

cgwalters commented 6 years ago

Sorry, missed this earlier. Excellent commit messages!