From 47e2c78644bea008f5097290ab0374ecac25796a Mon Sep 17 00:00:00 2001 From: TiyashaP Date: Apr 01 2022 13:30:36 +0000 Subject: [PATCH 1/4] Merge branch 'master' of https://pagure.io/fedora-ci/messages --- diff --git a/requirements.txt b/requirements.txt index fa43206..e38ea4f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ anymarkup jsonschema -rfc3986 +rfc3987 diff --git a/scripts/validate.py b/scripts/validate.py index 28f9d93..86b1876 100755 --- a/scripts/validate.py +++ b/scripts/validate.py @@ -33,7 +33,7 @@ except ImportError: yaml = None # Required for uri and email format validation. -import rfc3986 # noqa +import rfc3987 # noqa ERROR_FORMAT = """ ============================== Validation Error {number} ============================== From 375f864e8e2d5f82bcf069758fc689f74676de3e Mon Sep 17 00:00:00 2001 From: TiyashaP Date: Apr 01 2022 13:40:22 +0000 Subject: [PATCH 2/4] UNIFIED-8903.v1 --- diff --git a/mappings/results/brew-build.test.complete.yaml b/mappings/results/brew-build.test.complete.yaml index 6ae400a..89ba467 100644 --- a/mappings/results/brew-build.test.complete.yaml +++ b/mappings/results/brew-build.test.complete.yaml @@ -23,4 +23,4 @@ data: scratch: - "${body.artifact.scratch}" msg_id: - - "${body.message-id}" + - "${headers.JMSMessageID}" diff --git a/mappings/results/brew-build.test.error.yaml b/mappings/results/brew-build.test.error.yaml index 07fcf99..4ef72b5 100644 --- a/mappings/results/brew-build.test.error.yaml +++ b/mappings/results/brew-build.test.error.yaml @@ -23,4 +23,4 @@ data: scratch: - "${body.artifact.scratch}" msg_id: - - "${header.JMSMessageID}" + - "${headers.JMSMessageID}" diff --git a/mappings/results/brew-build.test.queued.yaml b/mappings/results/brew-build.test.queued.yaml index 1716f35..4d7ea9f 100644 --- a/mappings/results/brew-build.test.queued.yaml +++ b/mappings/results/brew-build.test.queued.yaml @@ -23,4 +23,4 @@ data: scratch: - "${body.artifact.scratch}" msg_id: - - "${header.JMSMessageID}" + - "${headers.JMSMessageID}" diff --git a/mappings/results/brew-build.test.running.yaml b/mappings/results/brew-build.test.running.yaml index b6ae052..4b95a9b 100644 --- a/mappings/results/brew-build.test.running.yaml +++ b/mappings/results/brew-build.test.running.yaml @@ -23,4 +23,4 @@ data: scratch: - "${body.artifact.scratch}" msg_id: - - "${header.JMSMessageID}" + - "${headers.JMSMessageID}" diff --git a/mappings/results/component-version.test.complete.yaml b/mappings/results/component-version.test.complete.yaml index 841c8eb..79e2743 100644 --- a/mappings/results/component-version.test.complete.yaml +++ b/mappings/results/component-version.test.complete.yaml @@ -32,4 +32,4 @@ data: ci_email: - "${body.contact.email}" msg_id: - - "${header.JMSMessageID}" + - "${headers.JMSMessageID}" diff --git a/mappings/results/container-image.test.complete.yaml b/mappings/results/container-image.test.complete.yaml index 24f4e78..36862a2 100644 --- a/mappings/results/container-image.test.complete.yaml +++ b/mappings/results/container-image.test.complete.yaml @@ -14,4 +14,4 @@ data: scratch: - "${body.artifact.scratch}" msg_id: - - "${header.JMSMessageID}" \ No newline at end of file + - "${headers.JMSMessageID}" \ No newline at end of file diff --git a/mappings/results/container-image.test.error.yaml b/mappings/results/container-image.test.error.yaml index fdbdad8..98080f7 100644 --- a/mappings/results/container-image.test.error.yaml +++ b/mappings/results/container-image.test.error.yaml @@ -14,4 +14,4 @@ data: scratch: - "${body.artifact.scratch}" msg_id: - - "${header.JMSMessageID}" \ No newline at end of file + - "${headers.JMSMessageID}" \ No newline at end of file diff --git a/mappings/results/container-image.test.queued.yaml b/mappings/results/container-image.test.queued.yaml index f8bedfe..c295e18 100644 --- a/mappings/results/container-image.test.queued.yaml +++ b/mappings/results/container-image.test.queued.yaml @@ -14,4 +14,4 @@ data: scratch: - "${body.artifact.scratch}" msg_id: - - "${header.JMSMessageID}" \ No newline at end of file + - "${headers.JMSMessageID}" \ No newline at end of file diff --git a/mappings/results/container-image.test.running.yaml b/mappings/results/container-image.test.running.yaml index 19af669..44d3bee 100644 --- a/mappings/results/container-image.test.running.yaml +++ b/mappings/results/container-image.test.running.yaml @@ -14,4 +14,4 @@ data: scratch: - "${body.artifact.scratch}" msg_id: - - "${header.JMSMessageID}" \ No newline at end of file + - "${headers.JMSMessageID}" \ No newline at end of file diff --git a/mappings/results/fedora-module.test.complete.yaml b/mappings/results/fedora-module.test.complete.yaml index 3816efd..a16a712 100644 --- a/mappings/results/fedora-module.test.complete.yaml +++ b/mappings/results/fedora-module.test.complete.yaml @@ -20,4 +20,4 @@ data: scratch: - "${body.artifact.scratch}" msg_id: - - "${header.JMSMessageID}" \ No newline at end of file + - "${headers.JMSMessageID}" \ No newline at end of file diff --git a/mappings/results/fedora-module.test.error.yaml b/mappings/results/fedora-module.test.error.yaml index cac4d54..214561f 100644 --- a/mappings/results/fedora-module.test.error.yaml +++ b/mappings/results/fedora-module.test.error.yaml @@ -20,4 +20,4 @@ data: scratch: - "${body.artifact.scratch}" msg_id: - - "${header.JMSMessageID}" \ No newline at end of file + - "${headers.JMSMessageID}" \ No newline at end of file diff --git a/mappings/results/fedora-module.test.queued.yaml b/mappings/results/fedora-module.test.queued.yaml index 75694ec..f43d351 100644 --- a/mappings/results/fedora-module.test.queued.yaml +++ b/mappings/results/fedora-module.test.queued.yaml @@ -20,4 +20,4 @@ data: scratch: - "${body.artifact.scratch}" msg_id: - - "${header.JMSMessageID}" \ No newline at end of file + - "${headers.JMSMessageID}" \ No newline at end of file diff --git a/mappings/results/fedora-module.test.running.yaml b/mappings/results/fedora-module.test.running.yaml index 4c8e941..4407988 100644 --- a/mappings/results/fedora-module.test.running.yaml +++ b/mappings/results/fedora-module.test.running.yaml @@ -20,4 +20,4 @@ data: scratch: - "${body.artifact.scratch}" msg_id: - - "${header.JMSMessageID}" \ No newline at end of file + - "${headers.JMSMessageID}" \ No newline at end of file diff --git a/mappings/results/product-build.test.complete.yaml b/mappings/results/product-build.test.complete.yaml index 9837e4d..f70449e 100644 --- a/mappings/results/product-build.test.complete.yaml +++ b/mappings/results/product-build.test.complete.yaml @@ -32,4 +32,4 @@ data: ci_email: - "${body.contact.email}" msg_id: - - "${header.JMSMessageID}" \ No newline at end of file + - "${headers.JMSMessageID}" \ No newline at end of file diff --git a/mappings/results/productmd-compose.test.complete.yaml b/mappings/results/productmd-compose.test.complete.yaml index fd8ba6d..0a44db6 100644 --- a/mappings/results/productmd-compose.test.complete.yaml +++ b/mappings/results/productmd-compose.test.complete.yaml @@ -22,7 +22,7 @@ data: scenario: - "#if(${body.test.scenario})${body.test.scenario}#{else}#end" msg_id: - - "${header.JMSMessageID}" + - "${headers.JMSMessageID}" ci_name: - "${body.contact.name}" ci_team: diff --git a/mappings/results/productmd-compose.test.error.yaml b/mappings/results/productmd-compose.test.error.yaml index a207e49..2893218 100644 --- a/mappings/results/productmd-compose.test.error.yaml +++ b/mappings/results/productmd-compose.test.error.yaml @@ -26,7 +26,7 @@ data: scenario: - "#if(${body.test.scenario})${body.test.scenario}#{else}#end" msg_id: - - "${header.JMSMessageID}" + - "${headers.JMSMessageID}" ci_name: - "${body.contact.name}" ci_team: diff --git a/mappings/results/productmd-compose.test.queued.yaml b/mappings/results/productmd-compose.test.queued.yaml index c90e588..76ff100 100644 --- a/mappings/results/productmd-compose.test.queued.yaml +++ b/mappings/results/productmd-compose.test.queued.yaml @@ -22,7 +22,7 @@ data: scenario: - "#if(${body.test.scenario})${body.test.scenario}#{else}#end" msg_id: - - "${header.JMSMessageID}" + - "${headers.JMSMessageID}" ci_name: - "${body.contact.name}" ci_team: diff --git a/mappings/results/productmd-compose.test.running.yaml b/mappings/results/productmd-compose.test.running.yaml index d8bf746..ea48977 100644 --- a/mappings/results/productmd-compose.test.running.yaml +++ b/mappings/results/productmd-compose.test.running.yaml @@ -22,7 +22,7 @@ data: scenario: - "#if(${body.test.scenario})${body.test.scenario}#{else}#end" msg_id: - - "${header.JMSMessageID}" + - "${headers.JMSMessageID}" ci_name: - "${body.contact.name}" ci_team: diff --git a/mappings/results/redhat-module.test.complete.yaml b/mappings/results/redhat-module.test.complete.yaml index 680af20..e22e999 100644 --- a/mappings/results/redhat-module.test.complete.yaml +++ b/mappings/results/redhat-module.test.complete.yaml @@ -20,4 +20,4 @@ data: scratch: - "${body.artifact.scratch}" msg_id: - - "${header.JMSMessageID}" + - "${headers.JMSMessageID}" diff --git a/mappings/results/redhat-module.test.error.yaml b/mappings/results/redhat-module.test.error.yaml index 3238f8c..a1a7dbe 100644 --- a/mappings/results/redhat-module.test.error.yaml +++ b/mappings/results/redhat-module.test.error.yaml @@ -20,4 +20,4 @@ data: scratch: - "${body.artifact.scratch}" msg_id: - - "${header.JMSMessageID}" \ No newline at end of file + - "${headers.JMSMessageID}" \ No newline at end of file diff --git a/mappings/results/redhat-module.test.queued.yaml b/mappings/results/redhat-module.test.queued.yaml index c86cf17..a4f0a3d 100644 --- a/mappings/results/redhat-module.test.queued.yaml +++ b/mappings/results/redhat-module.test.queued.yaml @@ -20,4 +20,4 @@ data: scratch: - "${body.artifact.scratch}" msg_id: - - "${header.JMSMessageID}" \ No newline at end of file + - "${headers.JMSMessageID}" \ No newline at end of file diff --git a/mappings/results/redhat-module.test.running.yaml b/mappings/results/redhat-module.test.running.yaml index 00521c6..0ba62be 100644 --- a/mappings/results/redhat-module.test.running.yaml +++ b/mappings/results/redhat-module.test.running.yaml @@ -20,4 +20,4 @@ data: scratch: - "${body.artifact.scratch}" msg_id: - - "${header.JMSMessageID}" \ No newline at end of file + - "${headers.JMSMessageID}" \ No newline at end of file From 3ec2b51ac63841e369ae15dfc8c5de86e4685090 Mon Sep 17 00:00:00 2001 From: TiyashaP Date: Apr 01 2022 13:47:58 +0000 Subject: [PATCH 3/4] UNIFIED-8903.v1 --- diff --git a/requirements.txt b/requirements.txt index e38ea4f..e67bb71 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ anymarkup jsonschema -rfc3987 +rfc3986 + diff --git a/scripts/validate.py b/scripts/validate.py index 86b1876..28f9d93 100755 --- a/scripts/validate.py +++ b/scripts/validate.py @@ -33,7 +33,7 @@ except ImportError: yaml = None # Required for uri and email format validation. -import rfc3987 # noqa +import rfc3986 # noqa ERROR_FORMAT = """ ============================== Validation Error {number} ============================== From 92f619533a6906e0a882e8df47499cfb77cea948 Mon Sep 17 00:00:00 2001 From: TiyashaP Date: Apr 01 2022 13:49:02 +0000 Subject: [PATCH 4/4] UNIFIED-8903.v1 --- diff --git a/requirements.txt b/requirements.txt index e67bb71..fa43206 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,3 @@ anymarkup jsonschema rfc3986 -