mirror of
https://github.com/openshift/community.okd.git
synced 2026-03-27 03:13:08 +00:00
* Upgrade Ansible and OKD versions for CI * Use ubi9 and fix sanity * Use correct pip install * Try using quotes * Ensure python3.9 * Upgrade ansible and molecule versions * Remove DeploymentConfig DeploymentConfigs are deprecated and seem to now be causing idempotence problems. Replacing them with Deployments fixes it. * Attempt to fix ldap integration tests Signed-off-by: Alina Buzachis <abuzachis@redhat.com> * Move sanity and unit tests to GH actions Signed-off-by: Alina Buzachis <abuzachis@redhat.com> * Firt round of sanity fixes Signed-off-by: Alina Buzachis <abuzachis@redhat.com> * Add kubernetes.core collection as sanity requirement Signed-off-by: Alina Buzachis <abuzachis@redhat.com> * Add ignore-2.16.txt Signed-off-by: Alina Buzachis <abuzachis@redhat.com> * Attempt to fix units Signed-off-by: Alina Buzachis <abuzachis@redhat.com> * Add ignore-2.17 Signed-off-by: Alina Buzachis <abuzachis@redhat.com> * Attempt to fix unit tests Signed-off-by: Alina Buzachis <abuzachis@redhat.com> * Add pytest-ansible to test-requirements.txt Signed-off-by: Alina Buzachis <abuzachis@redhat.com> * Add changelog fragment Signed-off-by: Alina Buzachis <abuzachis@redhat.com> * Add workflow for ansible-lint Signed-off-by: Alina Buzachis <abuzachis@redhat.com> * Apply black Signed-off-by: Alina Buzachis <abuzachis@redhat.com> * Fix linters Signed-off-by: Alina Buzachis <abuzachis@redhat.com> * Add # fmt: skip Signed-off-by: Alina Buzachis <abuzachis@redhat.com> * Yet another round of linting Signed-off-by: Alina Buzachis <abuzachis@redhat.com> * Yet another round of linting Signed-off-by: Alina Buzachis <abuzachis@redhat.com> * Remove setup.cfg Signed-off-by: Alina Buzachis <abuzachis@redhat.com> * Revert #fmt Signed-off-by: Alina Buzachis <abuzachis@redhat.com> * Use ansible-core 2.14 Signed-off-by: Alina Buzachis <abuzachis@redhat.com> * Cleanup ansible-lint ignores Signed-off-by: Alina Buzachis <abuzachis@redhat.com> * Try using service instead of pod IP * Fix typo * Actually use the correct port * See if NetworkPolicy is preventing connection * using Pod internal IP * fix adm prune auth roles syntax * adding some retry steps * fix: openshift_builds target * add flag --force-with-deps when building downstream collection * Remove yamllint from tox linters, bump minimum python supported version to 3.9, Remove support for ansible-core < 2.14 --------- Signed-off-by: Alina Buzachis <abuzachis@redhat.com> Co-authored-by: Mike Graves <mgraves@redhat.com> Co-authored-by: Alina Buzachis <abuzachis@redhat.com>
This commit is contained in:
@@ -11,7 +11,6 @@ import pytest
|
||||
|
||||
|
||||
def test_convert_storage_to_bytes():
|
||||
|
||||
data = [
|
||||
("1000", 1000),
|
||||
("1000Ki", 1000 * 1024),
|
||||
@@ -54,46 +53,48 @@ def validate_docker_response(resp, **kwargs):
|
||||
|
||||
|
||||
def test_parse_docker_image_ref_valid_image_with_digest():
|
||||
|
||||
image = "registry.access.redhat.com/ubi8/dotnet-21@sha256:f7718f5efd3436e781ee4322c92ab0c4ae63e61f5b36f1473a57874cc3522669"
|
||||
response, err = parse_docker_image_ref(image)
|
||||
assert err is None
|
||||
|
||||
validate_docker_response(response,
|
||||
hostname="registry.access.redhat.com",
|
||||
namespace="ubi8",
|
||||
name="dotnet-21",
|
||||
digest="sha256:f7718f5efd3436e781ee4322c92ab0c4ae63e61f5b36f1473a57874cc3522669")
|
||||
validate_docker_response(
|
||||
response,
|
||||
hostname="registry.access.redhat.com",
|
||||
namespace="ubi8",
|
||||
name="dotnet-21",
|
||||
digest="sha256:f7718f5efd3436e781ee4322c92ab0c4ae63e61f5b36f1473a57874cc3522669",
|
||||
)
|
||||
|
||||
|
||||
def test_parse_docker_image_ref_valid_image_with_tag_latest():
|
||||
|
||||
image = "registry.access.redhat.com/ubi8/dotnet-21:latest"
|
||||
response, err = parse_docker_image_ref(image)
|
||||
assert err is None
|
||||
|
||||
validate_docker_response(response,
|
||||
hostname="registry.access.redhat.com",
|
||||
namespace="ubi8",
|
||||
name="dotnet-21",
|
||||
tag="latest")
|
||||
validate_docker_response(
|
||||
response,
|
||||
hostname="registry.access.redhat.com",
|
||||
namespace="ubi8",
|
||||
name="dotnet-21",
|
||||
tag="latest",
|
||||
)
|
||||
|
||||
|
||||
def test_parse_docker_image_ref_valid_image_with_tag_int():
|
||||
|
||||
image = "registry.access.redhat.com/ubi8/dotnet-21:0.0.1"
|
||||
response, err = parse_docker_image_ref(image)
|
||||
assert err is None
|
||||
|
||||
validate_docker_response(response,
|
||||
hostname="registry.access.redhat.com",
|
||||
namespace="ubi8",
|
||||
name="dotnet-21",
|
||||
tag="0.0.1")
|
||||
validate_docker_response(
|
||||
response,
|
||||
hostname="registry.access.redhat.com",
|
||||
namespace="ubi8",
|
||||
name="dotnet-21",
|
||||
tag="0.0.1",
|
||||
)
|
||||
|
||||
|
||||
def test_parse_docker_image_ref_invalid_image():
|
||||
|
||||
# The hex value of the sha256 is not valid
|
||||
image = "registry.access.redhat.com/dotnet-21@sha256:f7718f5efd3436e781ee4322c92ab0c4ae63e61f5b36f1473a57874cc3522"
|
||||
response, err = parse_docker_image_ref(image)
|
||||
@@ -101,7 +102,6 @@ def test_parse_docker_image_ref_invalid_image():
|
||||
|
||||
|
||||
def test_parse_docker_image_ref_valid_image_without_hostname():
|
||||
|
||||
image = "ansible:2.10.0"
|
||||
response, err = parse_docker_image_ref(image)
|
||||
assert err is None
|
||||
@@ -110,16 +110,18 @@ def test_parse_docker_image_ref_valid_image_without_hostname():
|
||||
|
||||
|
||||
def test_parse_docker_image_ref_valid_image_without_hostname_and_with_digest():
|
||||
|
||||
image = "ansible@sha256:f7718f5efd3436e781ee4322c92ab0c4ae63e61f5b36f1473a57874cc3522669"
|
||||
response, err = parse_docker_image_ref(image)
|
||||
assert err is None
|
||||
|
||||
validate_docker_response(response, name="ansible", digest="sha256:f7718f5efd3436e781ee4322c92ab0c4ae63e61f5b36f1473a57874cc3522669")
|
||||
validate_docker_response(
|
||||
response,
|
||||
name="ansible",
|
||||
digest="sha256:f7718f5efd3436e781ee4322c92ab0c4ae63e61f5b36f1473a57874cc3522669",
|
||||
)
|
||||
|
||||
|
||||
def test_parse_docker_image_ref_valid_image_with_name_only():
|
||||
|
||||
image = "ansible"
|
||||
response, err = parse_docker_image_ref(image)
|
||||
assert err is None
|
||||
@@ -128,25 +130,27 @@ def test_parse_docker_image_ref_valid_image_with_name_only():
|
||||
|
||||
|
||||
def test_parse_docker_image_ref_valid_image_without_hostname_with_namespace_and_name():
|
||||
|
||||
image = "ibmcom/pause@sha256:fcaff905397ba63fd376d0c3019f1f1cb6e7506131389edbcb3d22719f1ae54d"
|
||||
response, err = parse_docker_image_ref(image)
|
||||
assert err is None
|
||||
|
||||
validate_docker_response(response,
|
||||
name="pause",
|
||||
namespace="ibmcom",
|
||||
digest="sha256:fcaff905397ba63fd376d0c3019f1f1cb6e7506131389edbcb3d22719f1ae54d")
|
||||
validate_docker_response(
|
||||
response,
|
||||
name="pause",
|
||||
namespace="ibmcom",
|
||||
digest="sha256:fcaff905397ba63fd376d0c3019f1f1cb6e7506131389edbcb3d22719f1ae54d",
|
||||
)
|
||||
|
||||
|
||||
def test_parse_docker_image_ref_valid_image_with_complex_namespace_name():
|
||||
|
||||
image = "registry.redhat.io/jboss-webserver-5/webserver54-openjdk11-tomcat9-openshift-rhel7:1.0"
|
||||
response, err = parse_docker_image_ref(image)
|
||||
assert err is None
|
||||
|
||||
validate_docker_response(response,
|
||||
hostname="registry.redhat.io",
|
||||
name="webserver54-openjdk11-tomcat9-openshift-rhel7",
|
||||
namespace="jboss-webserver-5",
|
||||
tag="1.0")
|
||||
validate_docker_response(
|
||||
response,
|
||||
hostname="registry.redhat.io",
|
||||
name="webserver54-openjdk11-tomcat9-openshift-rhel7",
|
||||
namespace="jboss-webserver-5",
|
||||
tag="1.0",
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user