From 0f262a31086ef5eb668541341735306fb655a965 Mon Sep 17 00:00:00 2001 From: Lukas Holecek Date: Nov 22 2021 06:45:31 +0000 Subject: Avoid mapping empty scenario as "not available" in ResultsDB --- diff --git a/mappings/results/container-image.test.complete.yaml b/mappings/results/container-image.test.complete.yaml index 0a6897f..40ebc64 100644 --- a/mappings/results/container-image.test.complete.yaml +++ b/mappings/results/container-image.test.complete.yaml @@ -10,6 +10,6 @@ data: item: - "${body.artifact.repository}@${body.artifact.digest}" scenario: - - "#if(${body.test.scenario})${body.test.scenario}#{else}not available#end" + - "#if(${body.test.scenario})${body.test.scenario}#end" scratch: - "${body.artifact.scratch}" diff --git a/mappings/results/container-image.test.error.yaml b/mappings/results/container-image.test.error.yaml index fb224b8..5dbf221 100644 --- a/mappings/results/container-image.test.error.yaml +++ b/mappings/results/container-image.test.error.yaml @@ -10,6 +10,6 @@ data: item: - "${body.artifact.repository}@${body.artifact.digest}" scenario: - - "#if(${body.test.scenario})${body.test.scenario}#{else}not available#end" + - "#if(${body.test.scenario})${body.test.scenario}#end" scratch: - "${body.artifact.scratch}" diff --git a/mappings/results/container-image.test.queued.yaml b/mappings/results/container-image.test.queued.yaml index 3dfc870..263f692 100644 --- a/mappings/results/container-image.test.queued.yaml +++ b/mappings/results/container-image.test.queued.yaml @@ -10,6 +10,6 @@ data: item: - "${body.artifact.repository}@${body.artifact.digest}" scenario: - - "#if(${body.test.scenario})${body.test.scenario}#{else}not available#end" + - "#if(${body.test.scenario})${body.test.scenario}#end" scratch: - "${body.artifact.scratch}" diff --git a/mappings/results/container-image.test.running.yaml b/mappings/results/container-image.test.running.yaml index 7b0769a..7eb35bb 100644 --- a/mappings/results/container-image.test.running.yaml +++ b/mappings/results/container-image.test.running.yaml @@ -10,6 +10,6 @@ data: item: - "${body.artifact.repository}@${body.artifact.digest}" scenario: - - "#if(${body.test.scenario})${body.test.scenario}#{else}not available#end" + - "#if(${body.test.scenario})${body.test.scenario}#end" scratch: - "${body.artifact.scratch}" diff --git a/mappings/results/fedora-module.test.complete.yaml b/mappings/results/fedora-module.test.complete.yaml index 5ac1ed5..7db538f 100644 --- a/mappings/results/fedora-module.test.complete.yaml +++ b/mappings/results/fedora-module.test.complete.yaml @@ -16,6 +16,6 @@ data: system_variant: - "#if(!$body.system.isEmpty())${body.system[0].variant}#end" scenario: - - "#if(${body.test.scenario})${body.test.scenario}#{else}not available#end" + - "#if(${body.test.scenario})${body.test.scenario}#end" scratch: - "${body.artifact.scratch}" diff --git a/mappings/results/fedora-module.test.error.yaml b/mappings/results/fedora-module.test.error.yaml index 9502a34..5ba4070 100644 --- a/mappings/results/fedora-module.test.error.yaml +++ b/mappings/results/fedora-module.test.error.yaml @@ -16,6 +16,6 @@ data: system_variant: - "#if(!$body.system.isEmpty())${body.system[0].variant}#end" scenario: - - "#if(${body.test.scenario})${body.test.scenario}#{else}not available#end" + - "#if(${body.test.scenario})${body.test.scenario}#end" scratch: - "${body.artifact.scratch}" diff --git a/mappings/results/fedora-module.test.queued.yaml b/mappings/results/fedora-module.test.queued.yaml index 41b0777..d015da6 100644 --- a/mappings/results/fedora-module.test.queued.yaml +++ b/mappings/results/fedora-module.test.queued.yaml @@ -16,6 +16,6 @@ data: system_variant: - "#if(!$body.system.isEmpty())${body.system[0].variant}#end" scenario: - - "#if(${body.test.scenario})${body.test.scenario}#{else}not available#end" + - "#if(${body.test.scenario})${body.test.scenario}#end" scratch: - "${body.artifact.scratch}" diff --git a/mappings/results/fedora-module.test.running.yaml b/mappings/results/fedora-module.test.running.yaml index 35291ce..24e1f50 100644 --- a/mappings/results/fedora-module.test.running.yaml +++ b/mappings/results/fedora-module.test.running.yaml @@ -16,6 +16,6 @@ data: system_variant: - "#if(!$body.system.isEmpty())${body.system[0].variant}#end" scenario: - - "#if(${body.test.scenario})${body.test.scenario}#{else}not available#end" + - "#if(${body.test.scenario})${body.test.scenario}#end" scratch: - "${body.artifact.scratch}" diff --git a/mappings/results/redhat-module.test.complete.yaml b/mappings/results/redhat-module.test.complete.yaml index 77d42ce..b48a9f4 100644 --- a/mappings/results/redhat-module.test.complete.yaml +++ b/mappings/results/redhat-module.test.complete.yaml @@ -16,6 +16,6 @@ data: system_variant: - "#if(!$body.system.isEmpty())${body.system[0].variant}#end" scenario: - - "#if(${body.test.scenario})${body.test.scenario}#{else}not available#end" + - "#if(${body.test.scenario})${body.test.scenario}#end" scratch: - "${body.artifact.scratch}" diff --git a/mappings/results/redhat-module.test.error.yaml b/mappings/results/redhat-module.test.error.yaml index 4289c48..d5bf3ca 100644 --- a/mappings/results/redhat-module.test.error.yaml +++ b/mappings/results/redhat-module.test.error.yaml @@ -16,6 +16,6 @@ data: system_variant: - "#if(!$body.system.isEmpty())${body.system[0].variant}#end" scenario: - - "#if(${body.test.scenario})${body.test.scenario}#{else}not available#end" + - "#if(${body.test.scenario})${body.test.scenario}#end" scratch: - "${body.artifact.scratch}" diff --git a/mappings/results/redhat-module.test.queued.yaml b/mappings/results/redhat-module.test.queued.yaml index 74abe5e..bf31ca4 100644 --- a/mappings/results/redhat-module.test.queued.yaml +++ b/mappings/results/redhat-module.test.queued.yaml @@ -16,6 +16,6 @@ data: system_variant: - "#if(!$body.system.isEmpty())${body.system[0].variant}#end" scenario: - - "#if(${body.test.scenario})${body.test.scenario}#{else}not available#end" + - "#if(${body.test.scenario})${body.test.scenario}#end" scratch: - "${body.artifact.scratch}" diff --git a/mappings/results/redhat-module.test.running.yaml b/mappings/results/redhat-module.test.running.yaml index 1ae5386..6d9595b 100644 --- a/mappings/results/redhat-module.test.running.yaml +++ b/mappings/results/redhat-module.test.running.yaml @@ -16,6 +16,6 @@ data: system_variant: - "#if(!$body.system.isEmpty())${body.system[0].variant}#end" scenario: - - "#if(${body.test.scenario})${body.test.scenario}#{else}not available#end" + - "#if(${body.test.scenario})${body.test.scenario}#end" scratch: - "${body.artifact.scratch}"