gitlab: run generator scripts with PYTHONUNBUFFERED

Set PYTHONUNBUFFERED so that script output is printed to the CI log without buffering/batching. Drop unneeded print flushing.
osbuild · Jul 31, 2023 · 028b1ee · 028b1ee
1 parent e7b5279
commit 028b1ee
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -45,6 +45,7 @@ generate-build-config:
   variables:
     RUNNER: aws/fedora-38-x86_64
     INTERNAL_NETWORK: "true"
+    PYTHONUNBUFFERED: 1
   script:
     - sudo dnf -y install go python3 gpgme-devel s3cmd
       osbuild osbuild-luks2 osbuild-lvm2 osbuild-ostree osbuild-selinux
@@ -67,6 +68,7 @@ generate-ostree-build-config-x86_64:
   variables:
     RUNNER: aws/fedora-38-x86_64
     INTERNAL_NETWORK: "true"
+    PYTHONUNBUFFERED: 1
   script:
     - sudo dnf -y install go python3 gpgme-devel s3cmd
       osbuild osbuild-luks2 osbuild-lvm2 osbuild-ostree osbuild-selinux podman

diff --git a/test/generate-build-config b/test/generate-build-config
@@ -42,7 +42,7 @@ def generate_manifests(outputdir):
            "-workers", "100",
            "-images", "qcow2",
            "-arches", arches_arg]
-    print(f"Running: {' '.join(cmd)}", flush=True)
+    print(f"Running: {' '.join(cmd)}")
     out, err = testlib.runcmd(cmd)
 
     # print stderr in case there were errors or warnings about skipped configurations

diff --git a/test/generate-ostree-build-config b/test/generate-ostree-build-config
@@ -92,7 +92,7 @@ def gen_dependency_manifests(config_map, outputdir):
                "-images", ",".join(gen_image_types),
                "-config", tmpfile.name,
                "-arches", arches_arg]
-        print(" ".join(cmd), flush=True)
+        print(" ".join(cmd))
         out, err = testlib.runcmd(cmd)
 
     # print stderr in case there were errors or warnings about skipped configurations