Fix freebsd indentation + enable release-testing tasks

**Depends on:**
- https://github.com/containers/podman/pull/21551
- https://github.com/containers/podman/pull/21562
- https://github.com/containers/podman/pull/21564

Signed-off-by: Chris Evich <cevich@redhat.com>
This commit is contained in:
Chris Evich
2024-02-08 09:54:56 -05:00
parent 07779e09f6
commit 92d6194f01

View File

@ -487,36 +487,37 @@ osx_alt_build_task:
always: always:
task_cleanup_script: *mac_cleanup task_cleanup_script: *mac_cleanup
# Build freebsd release natively on a FreeBSD VM. # Build freebsd release natively on a FreeBSD VM.
freebsd_alt_build_task: freebsd_alt_build_task:
name: "FreeBSD Cross" name: "FreeBSD Cross"
alias: freebsd_alt_build alias: freebsd_alt_build
# Only run on 'main' and PRs against 'main' # Only run on 'main' and PRs against 'main'
# Docs: ./contrib/cirrus/CIModes.md # Docs: ./contrib/cirrus/CIModes.md
only_if: | only_if: |
$CIRRUS_CHANGE_TITLE !=~ '.*CI:MACHINE.*' && $CIRRUS_CHANGE_TITLE !=~ '.*CI:MACHINE.*' &&
( $CIRRUS_BRANCH == 'main' || $CIRRUS_BASE_BRANCH == 'main' ) ( $CIRRUS_BRANCH == 'main' || $CIRRUS_BASE_BRANCH == 'main' )
depends_on: depends_on:
- build - build
env: env:
<<: *stdenvars <<: *stdenvars
# Functional FreeBSD builds must be built natively since they depend on CGO # Functional FreeBSD builds must be built natively since they depend on CGO
DISTRO_NV: freebsd-13 DISTRO_NV: freebsd-13
VM_IMAGE_NAME: notyet VM_IMAGE_NAME: notyet
CTR_FQIN: notyet CTR_FQIN: notyet
CIRRUS_SHELL: "/bin/sh" CIRRUS_SHELL: "/bin/sh"
TEST_FLAVOR: "altbuild" TEST_FLAVOR: "altbuild"
ALT_NAME: 'FreeBSD Cross' ALT_NAME: 'FreeBSD Cross'
freebsd_instance: freebsd_instance:
image_family: freebsd-13-2 image_family: freebsd-13-2
setup_script: setup_script:
- pkg install -y gpgme bash go-md2man gmake gsed gnugrep go pkgconf - pkg install -y gpgme bash go-md2man gmake gsed gnugrep go pkgconf
build_amd64_script: build_amd64_script:
- gmake podman-release - gmake podman-release
# This task cannot make use of the shared repo.tbz artifact and must # This task cannot make use of the shared repo.tbz artifact and must
# produce a new repo.tbz artifact for consumption by 'artifacts' task. # produce a new repo.tbz artifact for consumption by 'artifacts' task.
repo_prep_script: *repo_prep repo_prep_script: *repo_prep
repo_artifacts: *repo_artifacts repo_artifacts: *repo_artifacts
# Verify podman is compatible with the docker python-module. # Verify podman is compatible with the docker python-module.
@ -1203,22 +1204,22 @@ artifacts_task:
# When a new tag is pushed, confirm that the code and commits # When a new tag is pushed, confirm that the code and commits
# meet criteria for an official release. # meet criteria for an official release.
#release_task: release_task:
# name: "Verify Release" name: "Verify Release"
# alias: release alias: release
# # This should _only_ run for new tags # This should _only_ run for new tags
# # Docs: ./contrib/cirrus/CIModes.md # Docs: ./contrib/cirrus/CIModes.md
# only_if: $CIRRUS_TAG != '' only_if: $CIRRUS_TAG != ''
# depends_on: depends_on:
# - build - build
# - success - success
# gce_instance: *standardvm gce_instance: *standardvm
# env: env:
# <<: *stdenvars <<: *stdenvars
# TEST_FLAVOR: release TEST_FLAVOR: release
# clone_script: *get_gosrc clone_script: *get_gosrc
# setup_script: *setup setup_script: *setup
# main_script: *main main_script: *main
# When preparing to release a new version, this task may be manually # When preparing to release a new version, this task may be manually
@ -1227,22 +1228,22 @@ artifacts_task:
# #
# Note: This cannot use a YAML alias on 'release_task' as of this # Note: This cannot use a YAML alias on 'release_task' as of this
# comment, it is incompatible with 'trigger_type: manual' # comment, it is incompatible with 'trigger_type: manual'
#release_test_task: release_test_task:
# name: "Optional Release Test" name: "Optional Release Test"
# alias: release_test alias: release_test
# # Release-PRs always include "release" or "Bump" in the title # Release-PRs always include "release" or "Bump" in the title
# # Docs: ./contrib/cirrus/CIModes.md # Docs: ./contrib/cirrus/CIModes.md
# only_if: $CIRRUS_CHANGE_TITLE =~ '.*((release)|(bump)).*' only_if: $CIRRUS_CHANGE_TITLE =~ '.*((release)|(bump)).*'
# # Allow running manually only as part of release-related builds # Allow running manually only as part of release-related builds
# # see RELEASE_PROCESS.md # see RELEASE_PROCESS.md
# trigger_type: manual trigger_type: manual
# depends_on: depends_on:
# - build - build
# - success - success
# gce_instance: *standardvm gce_instance: *standardvm
# env: env:
# <<: *stdenvars <<: *stdenvars
# TEST_FLAVOR: release TEST_FLAVOR: release
# clone_script: *get_gosrc clone_script: *get_gosrc
# setup_script: *setup setup_script: *setup
# main_script: *main main_script: *main