ci: enhancements

.github/workflows/ci.yml

@@ -79,11 +79,11 @@ jobs:
           source test/ci/test-onboarding.sh
           run_test
 
-      - name: Get manufacturer, rendezvous and owner server logs after a failure
-        if: failure()
+      - name: Get manufacturer, rendezvous and owner server logs
+        if: always()
         run: |
           source test/ci/test-onboarding.sh
-          get_server_logs
+          get_logs
 
       - name: Cleanup the environment
         if: always()
@@ -108,11 +108,11 @@ jobs:
           source test/ci/test-ov-verification.sh
           run_test
 
-      - name: Get manufacturer, rendezvous and owner server logs after a failure
-        if: failure()
+      - name: Get manufacturer, rendezvous and owner server logs
+        if: always()
         run: |
           source test/ci/test-ov-verification.sh
-          get_server_logs
+          get_logs
 
       - name: Cleanup the environment
         if: always()
@@ -137,11 +137,11 @@ jobs:
           source test/ci/test-resale.sh
           run_test
 
-      - name: Get manufacturer, rendezvous and owner server logs after failure
-        if: failure()
+      - name: Get manufacturer, rendezvous and owner server logs
+        if: always()
         run: |
           source test/ci/test-resale.sh
-          get_server_logs
+          get_logs
 
       - name: Cleanup the environment
         if: always()
@@ -167,10 +167,10 @@ jobs:
           run_test
 
       - name: Get Manufacturer, Rendezvous and Owner server logs after a failed onboarding
-        if: failure()
+        if: always()
         run: |
           source test/ci/test-fsim-wget.sh
-          get_server_logs
+          get_logs
 
       - name: Cleanup the environment
         if: always()
@@ -196,10 +196,10 @@ jobs:
           run_test
 
       - name: Get Manufacturer, Rendezvous and Owner server logs after a failed onboarding
-        if: failure()
+        if: always()
         run: |
           source test/ci/test-fsim-upload.sh
-          get_server_logs
+          get_logs
 
       - name: Cleanup the environment
         if: always()
@@ -225,10 +225,10 @@ jobs:
           run_test
 
       - name: Get Manufacturer, Rendezvous and Owner server logs after a failed onboarding
-        if: failure()
+        if: always()
         run: |
           source test/ci/test-fsim-download.sh
-          get_server_logs
+          get_logs
 
       - name: Cleanup the environment
         if: always()
@@ -253,11 +253,11 @@ jobs:
           source test/ci/test-onboarding-config.sh
           run_test
 
-      - name: Get manufacturer, rendezvous and owner server logs after a failure
-        if: failure()
+      - name: Get manufacturer, rendezvous and owner server logs
+        if: always()
         run: |
           source test/ci/test-onboarding-config.sh
-          get_server_logs
+          get_logs
 
       - name: Cleanup the environment
         if: always()

.github/workflows/containers.yml

@@ -26,11 +26,11 @@ jobs:
           source test/container/test-onboarding.sh
           run_test
 
-      - name: Get manufacturer, rendezvous and owner server logs after failure
-        if: failure()
+      - name: Get manufacturer, rendezvous and owner server logs
+        if: always()
         run: |
           source test/container/test-onboarding.sh
-          get_server_logs
+          get_logs
 
       - name: Cleanup the environment
         if: always()
@@ -57,11 +57,11 @@ jobs:
           source test/container/test-onboarding-postgres.sh
           run_test
 
-      - name: Get manufacturer, rendezvous and owner server logs after failure
-        if: failure()
+      - name: Get manufacturer, rendezvous and owner server logs
+        if: always()
         run: |
           source test/container/test-onboarding-postgres.sh
-          get_server_logs
+          get_logs
 
       - name: Cleanup the environment
         if: always()
@@ -88,11 +88,11 @@ jobs:
           source test/container/test-ov-verification.sh
           run_test
 
-      - name: Get manufacturer, rendezvous and owner server logs after failure
-        if: failure()
+      - name: Get manufacturer, rendezvous and owner server logs
+        if: always()
         run: |
           source test/container/test-ov-verification.sh
-          get_server_logs
+          get_logs
 
       - name: Cleanup the environment
         if: always()
@@ -118,11 +118,11 @@ jobs:
           source test/container/test-resale.sh
           run_test
 
-      - name: Get manufacturer, rendezvous and owner server logs after failure
-        if: failure()
+      - name: Get manufacturer, rendezvous and owner server logs
+        if: always()
         run: |
           source test/container/test-resale.sh
-          get_server_logs
+          get_logs
 
       - name: Cleanup the environment
         if: always()
@@ -148,11 +148,11 @@ jobs:
           source test/container/test-fsim-upload.sh
           run_test
 
-      - name: Get manufacturer, rendezvous and owner server logs after failure
-        if: failure()
+      - name: Get manufacturer, rendezvous and owner server logs
+        if: always()
         run: |
           source test/container/test-fsim-upload.sh
-          get_server_logs
+          get_logs
 
       - name: Cleanup the environment
         if: always()
@@ -178,11 +178,11 @@ jobs:
           source test/container/test-fsim-download.sh
           run_test
 
-      - name: Get manufacturer, rendezvous and owner server logs after failure
-        if: failure()
+      - name: Get manufacturer, rendezvous and owner server logs
+        if: always()
         run: |
           source test/container/test-fsim-download.sh
-          get_server_logs
+          get_logs
 
       - name: Cleanup the environment
         if: always()
@@ -208,11 +208,11 @@ jobs:
           source test/container/test-fsim-wget.sh
           run_test
 
-      - name: Get manufacturer, rendezvous and owner server logs after failure
-        if: failure()
+      - name: Get manufacturer, rendezvous and owner server logs
+        if: always()
         run: |
           source test/container/test-fsim-wget.sh
-          get_server_logs
+          get_logs
 
       - name: Cleanup the environment
         if: always()
@@ -239,11 +239,11 @@ jobs:
           source test/container/test-onboarding-config.sh
           run_test
 
-      - name: Get manufacturer, rendezvous and owner server logs after failure
-        if: failure()
+      - name: Get manufacturer, rendezvous and owner server logs
+        if: always()
         run: |
           source test/container/test-onboarding-config.sh
-          get_server_logs
+          get_logs
 
       - name: Cleanup the environment
         if: always()

.gitignore

@@ -3,6 +3,6 @@ go.work
 go.work.sum
 *.db
 go-fdo-server
-go-fdo-server-*.tar.gz
+go-fdo-server-*.tar.*
 rpmbuild
 test/workdir

.packit.yaml

@@ -1,6 +1,9 @@
 ---
 # https://packit.dev/docs/configuration/
 
+# We want to generate packages with the original commit sha
+# https://packit.dev/docs/configuration#merge_pr_in_ci
+merge_pr_in_ci: false
 
 files_to_sync:
   - src:
@@ -17,12 +20,7 @@ upstream_tag_template: v{version}
 copy_upstream_release_description: true
 
 srpm_build_deps:
-  - curl
   - git
-  - make
-  - bison
-  - gcc
-  - glibc-devel
   - golang
   - go-vendor-tools
   - python3-tomlkit
@@ -36,28 +34,27 @@ packages:
   go-fdo-server-centos:
     downstream_package_name: go-fdo-server
     upstream_package_name: go-fdo-server
-    pkg_tool: centpkg
     specfile_path: build/package/rpm/go-fdo-server.spec
+    pkg_tool: centpkg
 
 actions:
   fix-spec-file:
     - |
-      bash -c '
+      bash -xc '
       #! /bin/bash
       export BASE_DIR=build/package/rpm
       export SPEC_FILE=${BASE_DIR}/go-fdo-server.spec
       # We need the full commit hash
       export COMMIT=$(git rev-parse ${PACKIT_PROJECT_COMMIT})
       sed -i "s/^%global commit\(\s*\).*/%global commit\1${COMMIT}/" ${SPEC_FILE}
-      sed -i "s/^Version:\(\s*\).*/Version\:\1${PACKIT_PROJECT_VERSION}/" ${SPEC_FILE}
-      sed -i "s/^Release:\(\s*\)\S+/Release:\1${PACKIT_RPMSPEC_RELEASE}%{?dist}/" ${SPEC_FILE}
+      sed -i "s/^Version:\(\s*\).*/Version:\1${PACKIT_PROJECT_VERSION}/" ${SPEC_FILE}
+      sed -i "s/^Release:\(\s*\).*/Release:\1${PACKIT_RPMSPEC_RELEASE}%{?dist}/" ${SPEC_FILE}
       '
   post-modifications:
     # https://fedora.gitlab.io/sigs/go/go-vendor-tools/scenarios/#manual-update
     - |
-      bash -c '
+      bash -xc '
       #! /bin/bash
-      set -x
       export GOTOOLCHAIN=auto
       export BASE_DIR=${PACKIT_UPSTREAM_REPO}/build/package/rpm
       export GO_VENDOR_TOOLS_CONFIG=${BASE_DIR}/go-vendor-tools.toml
@@ -74,47 +71,35 @@ jobs:
 
   # Fedora jobs
 
-  - &fdo_copr_build_fedora
+  - &copr_fedora
     job: copr_build
     packages: [go-fdo-server-fedora]
     trigger: pull_request
-    targets:
-      fedora-branched:
-        additional_repos:
-          - https://download.copr.fedorainfracloud.org/results/@go-sig/golang-rawhide/fedora-$releasever-$basearch/
-        additional_packages:
-          - golang
-      fedora-rawhide:
-        additional_repos:
-          - https://download.copr.fedorainfracloud.org/results/@go-sig/golang-rawhide/fedora-rawhide-$basearch/
-        additional_packages:
-          - golang
-
-
-  - <<: *fdo_copr_build_fedora
+    targets: ["fedora-latest-stable", "fedora-latest", "fedora-rawhide"]
+
+  - <<: *copr_fedora
     trigger: commit
     branch: main
     owner: "@fedora-iot"
     project: fedora-iot
 
-
-  - job: sync_from_downstream
-    trigger: commit
-
   - job: propose_downstream
     trigger: release
     packages: [go-fdo-server-fedora]
-    dist_git_branches: ["fedora-development", "fedora-stable"]
+    # Avoid divergent branches: https://packit.dev/docs/fedora-releases-guide/non-divergent-dist-git-branches
+    dist_git_branches:
+      rawhide:
+        fast_forward_merge_into: ["fedora-latest-stable","fedora-latest"]
 
   - job: koji_build
     trigger: commit
     allowed_pr_authors: [all_committers]
-    dist_git_branches: ["fedora-development", "fedora-stable"]
+    dist_git_branches: ["fedora-latest-stable", "fedora-latest", "fedora-rawhide"]
 
   - job: bodhi_update
     trigger: commit
     allowed_builders: [all_committers]
-    dist_git_branches: ["fedora-development", "fedora-stable"]
+    dist_git_branches: ["fedora-latest-stable", "fedora-latest", "fedora-rawhide"]
 
   # Fedora E2E Testing jobs
 
@@ -123,30 +108,17 @@ jobs:
     identifier: e2e-fedora
     tmt_plan: test/fmf/plans/e2e
     packages: [go-fdo-server-fedora]
-    targets:
-      - fedora-latest-stable
-      - fedora-latest
-      - fedora-rawhide
+    targets: ["fedora-latest-stable", "fedora-latest", "fedora-rawhide"]
 
   # CentOS jobs
 
-  - &fdo_copr_build_centos
+  - &copr_centos
     job: copr_build
     packages: [go-fdo-server-centos]
     trigger: pull_request
-    targets:
-      epel-9:
-        additional_repos:
-          - https://download.copr.fedorainfracloud.org/results/@go-sig/golang-rawhide/epel-9-$basearch/
-        additional_packages:
-          - golang
-      epel-10:
-        additional_repos:
-          - https://download.copr.fedorainfracloud.org/results/@go-sig/golang-rawhide/epel-10-$basearch/
-        additional_packages:
-          - golang
-
-  - <<: *fdo_copr_build_centos
+    targets: ["centos-stream-9", "centos-stream-10"]
+
+  - <<: *copr_centos
     trigger: commit
     branch: main
     owner: "@fedora-iot"
@@ -159,6 +131,4 @@ jobs:
     identifier: e2e-centos
     tmt_plan: test/fmf/plans/e2e
     packages: [go-fdo-server-centos]
-    targets:
-      - epel-9
-      - epel-10
+    targets: ["centos-stream-9", "centos-stream-10"]