tree: import changes from testing-devel at 6e013487e0

.github/workflows/add-override.yml

@@ -48,6 +48,9 @@ jobs:
           # We need an unbroken commit chain when pushing to the fork.  Don't
           # make assumptions about which commits are already available there.
           fetch-depth: 0
+      # https://github.com/actions/checkout/issues/766
+      - name: Mark git checkout as safe
+        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
       - name: Update metadata
         env:
           TARGET: ${{ github.event.inputs.target }}

.github/workflows/remove-graduated-overrides.yml

@@ -34,6 +34,9 @@ jobs:
         uses: actions/checkout@v2
         with:
           ref: ${{ matrix.branch }}
+      # https://github.com/actions/checkout/issues/766
+      - name: Mark git checkout as safe
+        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
       - name: Remove graduated overrides
         run: |
           git config user.name 'CoreOS Bot'

ci/overrides.py

@@ -74,7 +74,7 @@ def main():
     pin.set_defaults(func=do_pin)
 
     srpms = subcommands.add_parser('srpms',
-            description='Name the source RPMs for a Bodhi update.')
+            description='Name the relevant source RPMs for a Bodhi update.')
     srpms.add_argument('update', help='ID or URL of Bodhi update')
     srpms.set_defaults(func=do_srpms)
 
@@ -133,8 +133,13 @@ def do_pin(args):
 
 
 def do_srpms(args):
+    printed = False
     for nvr in get_source_nvrs(get_bodhi_update(args.update)):
-        print(nvr)
+        if get_binary_packages([nvr]):
+            print(nvr)
+            printed = True
+    if not printed:
+        raise Exception('specified update contains no binary packages listed in lockfiles')
 
 
 def do_graduate(_args):

tests/kola/ignition/resource/authenticated-gs/config.bu

@@ -0,0 +1,14 @@
+# Objects accessible by any authenticated GS user, such as the credentials
+# associated with the GCE instance
+
+variant: fcos
+version: 1.2.0
+ignition:
+  config:
+    merge:
+      - source: "gs://ignition-test-fixtures/resources/authenticated-var.ign"
+storage:
+  files:
+    - path: /var/resource/gs-auth
+      contents:
+        source: "gs://ignition-test-fixtures/resources/authenticated"

tests/kola/ignition/resource/authenticated-gs/data/commonlib.sh

@@ -0,0 +1 @@
+../../../../data/commonlib.sh

tests/kola/ignition/resource/authenticated-gs/data/expected/gs-auth

@@ -0,0 +1 @@
+kola-authenticated

tests/kola/ignition/resource/authenticated-gs/data/expected/gs-config

@@ -0,0 +1 @@
+kola-config

tests/kola/ignition/resource/authenticated-gs/test.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+# kola: { "tags": "needs-internet", "platforms": "gce" }
+# - tags: needs-internet
+#   - We fetch resources from GCS.
+# - platforms: gce
+#   - We authenticate to GCS with the GCE instance's credentials.
+
+set -xeuo pipefail
+
+. $KOLA_EXT_DATA/commonlib.sh
+
+if ! diff -rZ $KOLA_EXT_DATA/expected /var/resource; then
+    fatal "fetched data mismatch"
+else
+    ok "fetched data ok"
+fi
+
+# verify that the objects are inaccessible anonymously
+for obj in authenticated authenticated-var.ign; do
+    if curl -sf "https://storage.googleapis.com/ignition-test-fixtures/resources/$obj"; then
+        fatal "anonymously fetching authenticated resource should have failed, but did not"
+    fi
+done
+
+# ...but that the anonymous object is accessible
+if ! curl -sf "https://storage.googleapis.com/ignition-test-fixtures/resources/anonymous" > /dev/null; then
+    fatal "anonymous resource is inaccessible"
+fi
+
+ok "resource checks ok"

tests/kola/ignition/resource/remote/config.bu

@@ -1,5 +1,5 @@
 variant: fcos
-version: 1.0.0
+version: 1.2.0
 storage:
   files:
     - path: /var/resource/http
@@ -8,6 +8,9 @@ storage:
     - path: /var/resource/https
       contents:
         source: "https://ignition-test-fixtures.s3.amazonaws.com/resources/anonymous"
+    - path: /var/resource/gs-anon
+      contents:
+        source: "gs://ignition-test-fixtures/resources/anonymous"
     - path: /var/resource/s3-anon
       contents:
         source: "s3://ignition-test-fixtures/resources/anonymous"

tests/kola/ignition/resource/remote/data/expected/gs-anon

@@ -0,0 +1 @@
+kola-anonymous

tests/kola/kdump/crash/test.sh

@@ -19,7 +19,14 @@ set -xeuo pipefail
 
 case "${AUTOPKGTEST_REBOOT_MARK:-}" in
   "")
+      if [ $(systemctl show -p Result kdump.service) != "Result=success" ]; then
+          fatal "kdump.service failed to start"
+      fi
       /tmp/autopkgtest-reboot-prepare aftercrash
+      # Add in a sleep to workaround race condition where XFS/kernel errors happen
+      # during crash kernel boot.
+      # https://github.com/coreos/fedora-coreos-tracker/issues/1195
+      sleep 5
       echo "Triggering sysrq"
       sync
       echo 1 > /proc/sys/kernel/sysrq