[testing] Revert recent promotion to testing branch

.cci.jenkinsfile

@@ -1,6 +1,6 @@
 @Library('github.com/coreos/coreos-ci-lib@master') _
 
-coreos.pod([image: "quay.io/coreos-assembler/coreos-assembler:latest", kvm: true, memory: "9Gi"]) {
+coreos.pod([image: "quay.io/coreos-assembler/coreos-assembler:latest", kvm: true]) {
     stage("Build") {
         dir("fedora-coreos-config") {
             checkout scm
@@ -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 -- --parallel 8
+                cosa kola run
             """)
         }
     }

README.md

@@ -62,20 +62,3 @@ 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)

manifests/fedora-coreos-base.yaml → fedora-coreos-base.yaml

@@ -4,7 +4,6 @@
 
 include:
   - ignition-and-ostree.yaml
-  - file-transfer.yaml
 
 initramfs-args:
   - --no-hostonly
@@ -55,9 +54,6 @@ remove-from-packages:
               /usr/lib/systemd/system/systemd-networkd-wait-online.service]
   - [systemd-container, /usr/lib/systemd/network/.*]
   - [systemd-udev, /usr/lib/systemd/network/.*]
-  # We're still using the legacy dracut network module for now. Dracut keys off
-  # of this: https://github.com/dracutdevs/dracut/blob/1fcc70fe57eea0ea658aa2de5c0044683fe85cf1/modules.d/40network/module-setup.sh#L11
-  - [NetworkManager, /usr/libexec/nm-initrd-generator]
 
 
 remove-files:
@@ -126,24 +122,23 @@ packages:
   - cryptsetup
   - cifs-utils
   # Time sync
-  - chrony
+  - chrony timedatex
   # Extra runtime
   - sssd shadow-utils
   - logrotate
   # Used by admins interactively
   - sudo coreutils less tar xz gzip bzip2
-  - socat net-tools bind-utils
+  - nmap-ncat net-tools bind-utils
   - bash-completion
   - openssl
   - vim-minimal
-  # file-transfer: note fuse-sshfs is not in RHEL
-  # so we can't put it in file-transfer.yaml
-  - fuse-sshfs
+  # Moving files around and verifying them
+  - rsync fuse-sshfs
+  - gnupg2
   # User experience
   - console-login-helper-messages-issuegen
   - console-login-helper-messages-motdgen
   - console-login-helper-messages-profile
-  - toolbox
   # CoreOS Installer
   - coreos-installer coreos-installer-dracut
   # i18n

image.yaml

@@ -5,9 +5,6 @@ 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

manifest-lock.overrides.x86_64.json

@@ -1,10 +1,28 @@
 {
   "packages": {
     "ignition": {
-      "evra": "2.0.1-5.git641ec6a.fc31.x86_64"
+      "evra": "2.0.1-4.git641ec6a.fc30.x86_64"
     },
-    "nfs-utils-coreos": {
-      "evra": "1:2.4.1-2.rc1.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"
     }
   }
 }