mirror of
https://github.com/containers/podman.git
synced 2025-06-20 17:13:43 +08:00
Update Cirrus display names, and fix get-ci-vm script
Signed-off-by: Matt Heon <mheon@redhat.com>
This commit is contained in:
@ -55,6 +55,7 @@ env:
|
|||||||
DISTRO_NV: # any {PRIOR_,}{FEDORA,DEBIAN}_NAME value
|
DISTRO_NV: # any {PRIOR_,}{FEDORA,DEBIAN}_NAME value
|
||||||
VM_IMAGE_NAME: # One of the "Google-cloud VM Images" (above)
|
VM_IMAGE_NAME: # One of the "Google-cloud VM Images" (above)
|
||||||
CTR_FQIN: # One of the "Container FQIN's" (above)
|
CTR_FQIN: # One of the "Container FQIN's" (above)
|
||||||
|
CI_DESIRED_DATABASE: boltdb # One of "", "sqlite", "boltdb"
|
||||||
|
|
||||||
# Curl-command prefix for downloading task artifacts, simply add the
|
# Curl-command prefix for downloading task artifacts, simply add the
|
||||||
# the url-encoded task name, artifact name, and path as a suffix.
|
# the url-encoded task name, artifact name, and path as a suffix.
|
||||||
@ -563,7 +564,7 @@ windows_smoke_test_task:
|
|||||||
local_integration_test_task: &local_integration_test_task
|
local_integration_test_task: &local_integration_test_task
|
||||||
# Integration-test task name convention:
|
# Integration-test task name convention:
|
||||||
# <int.|sys.> <podman|remote> <Distro NV> <root|rootless>
|
# <int.|sys.> <podman|remote> <Distro NV> <root|rootless>
|
||||||
name: &std_name_fmt "$TEST_FLAVOR $PODBIN_NAME $DISTRO_NV $PRIV_NAME $TEST_ENVIRON"
|
name: &std_name_fmt "$TEST_FLAVOR $PODBIN_NAME $DISTRO_NV $PRIV_NAME $TEST_ENVIRON ${CI_DESIRED_DATABASE}"
|
||||||
alias: local_integration_test
|
alias: local_integration_test
|
||||||
# Docs: ./contrib/cirrus/CIModes.md
|
# Docs: ./contrib/cirrus/CIModes.md
|
||||||
only_if: *not_tag_branch_build_docs
|
only_if: *not_tag_branch_build_docs
|
||||||
|
@ -134,7 +134,7 @@ func (p *PodmanTestIntegration) StopRemoteService() {
|
|||||||
// MakeOptions assembles all the podman main options
|
// MakeOptions assembles all the podman main options
|
||||||
func getRemoteOptions(p *PodmanTestIntegration, args []string) []string {
|
func getRemoteOptions(p *PodmanTestIntegration, args []string) []string {
|
||||||
networkDir := p.NetworkConfigDir
|
networkDir := p.NetworkConfigDir
|
||||||
podmanOptions := strings.Split(fmt.Sprintf("--root %s --runroot %s --runtime %s --conmon %s --network-config-dir %s --network-backend %s --cgroup-manager %s --database-backend %s",
|
podmanOptions := strings.Split(fmt.Sprintf("--root %s --runroot %s --runtime %s --conmon %s --network-config-dir %s --network-backend %s --cgroup-manager %s --db-backend %s",
|
||||||
p.Root, p.RunRoot, p.OCIRuntime, p.ConmonBinary, networkDir, p.NetworkBackend.ToString(), p.CgroupManager, p.DatabaseBackend), " ")
|
p.Root, p.RunRoot, p.OCIRuntime, p.ConmonBinary, networkDir, p.NetworkBackend.ToString(), p.CgroupManager, p.DatabaseBackend), " ")
|
||||||
podmanOptions = append(podmanOptions, strings.Split(p.StorageOptions, " ")...)
|
podmanOptions = append(podmanOptions, strings.Split(p.StorageOptions, " ")...)
|
||||||
podmanOptions = append(podmanOptions, args...)
|
podmanOptions = append(podmanOptions, args...)
|
||||||
|
Reference in New Issue
Block a user