From d716e9d7b4dfafea88268223a16e85cb6a33226c Mon Sep 17 00:00:00 2001 From: fredlev Date: Sun, 6 Nov 2022 23:57:21 +0800 Subject: [PATCH] Accept any string for "network_mode" in molecule.json schema (#3725) * accept any string for network mode * keep enum * rm default from enum * defautl is a so called "common" value * use "foo" instead of "service: vpn" --- src/molecule/data/molecule.json | 5 ----- tools/test-schema/test/molecule/default/molecule.yml | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/molecule/data/molecule.json b/src/molecule/data/molecule.json index 7d87b5163..00b867b31 100644 --- a/src/molecule/data/molecule.json +++ b/src/molecule/data/molecule.json @@ -229,11 +229,6 @@ "type": "string" }, { - "pattern": "^service:[a-zA-Z0-9:_.\\\\-]+$", - "type": "string" - }, - { - "pattern": "^container:[a-zA-Z0-9][a-zA-Z0-9_.-]+$", "type": "string" } ], diff --git a/tools/test-schema/test/molecule/default/molecule.yml b/tools/test-schema/test/molecule/default/molecule.yml index b3e290d9b..b26de3853 100644 --- a/tools/test-schema/test/molecule/default/molecule.yml +++ b/tools/test-schema/test/molecule/default/molecule.yml @@ -74,7 +74,7 @@ platforms: - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - /sys/fs/cgroup:/sys/fs/cgroup:ro - network_mode: service:vpn + network_mode: foo privileged: true environment: &env http_proxy: "{{ lookup('env', 'http_proxy') }}"