From 9404b0640a3daeef3921f9d561e0e48ce1a3fe1c Mon Sep 17 00:00:00 2001 From: sanne raymaekers Date: Mon, 13 Jul 2020 12:51:04 +0200 Subject: [PATCH] test: Regenerate the rhel-8 cases to add subscriptions --- test/cases/rhel_8-aarch64-tar-boot.json | 27 +++ test/cases/rhel_8-ppc64le-qcow2-boot.json | 24 ++- test/cases/rhel_8-ppc64le-tar-boot.json | 27 +++ test/cases/rhel_8-s390x-qcow2-boot.json | 24 ++- test/cases/rhel_8-s390x-tar-boot.json | 29 ++- test/cases/rhel_8-x86_64-ami-boot.json | 13 +- test/cases/rhel_8-x86_64-openstack-boot.json | 24 ++- test/cases/rhel_8-x86_64-qcow2-boot.json | 24 ++- .../rhel_8-x86_64-rhel_edge_commit-boot.json | 13 +- test/cases/rhel_8-x86_64-tar-boot.json | 29 ++- test/cases/rhel_8-x86_64-vhd-boot.json | 24 ++- test/cases/rhel_8-x86_64-vmdk-boot.json | 24 ++- .../format-request-map.json | 165 ++++++++++++++++++ .../test-case-generators/generate-test-cases | 17 +- 14 files changed, 448 insertions(+), 16 deletions(-) diff --git a/test/cases/rhel_8-aarch64-tar-boot.json b/test/cases/rhel_8-aarch64-tar-boot.json index d018c4e06..5f31879ef 100644 --- a/test/cases/rhel_8-aarch64-tar-boot.json +++ b/test/cases/rhel_8-aarch64-tar-boot.json @@ -38,6 +38,33 @@ } } }, + "blueprint": { + "name": "tar-boot-test", + "description": "Image for boot test", + "packages": [ + { + "name": "openssh-server", + "version": "*" + } + ], + "modules": [], + "groups": [], + "customizations": { + "user": [ + { + "name": "redhat", + "key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost" + } + ], + "subscription": { + "organization": 2040324, + "activation-key": "my-secret-key", + "server-url": "subscription.rhsm.redhat.com", + "base-url": "http://cdn.redhat.com", + "insights": true + } + } + }, "manifest": { "sources": { "org.osbuild.files": { diff --git a/test/cases/rhel_8-ppc64le-qcow2-boot.json b/test/cases/rhel_8-ppc64le-qcow2-boot.json index 2b2aba31f..1c5e7e67d 100644 --- a/test/cases/rhel_8-ppc64le-qcow2-boot.json +++ b/test/cases/rhel_8-ppc64le-qcow2-boot.json @@ -33,6 +33,28 @@ } } }, + "blueprint": { + "name": "qcow2-boot-test", + "description": "Image for boot test", + "packages": [], + "modules": [], + "groups": [], + "customizations": { + "user": [ + { + "name": "redhat", + "key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost" + } + ], + "subscription": { + "organization": 2040324, + "activation-key": "my-secret-key", + "server-url": "subscription.rhsm.redhat.com", + "base-url": "http://cdn.redhat.com", + "insights": true + } + } + }, "manifest": { "sources": { "org.osbuild.files": { @@ -10965,4 +10987,4 @@ ], "timezone": "UTC" } -} \ No newline at end of file +} diff --git a/test/cases/rhel_8-ppc64le-tar-boot.json b/test/cases/rhel_8-ppc64le-tar-boot.json index 0e7f3abd3..d8b9f6b83 100644 --- a/test/cases/rhel_8-ppc64le-tar-boot.json +++ b/test/cases/rhel_8-ppc64le-tar-boot.json @@ -38,6 +38,33 @@ } } }, + "blueprint": { + "name": "tar-boot-test", + "description": "Image for boot test", + "packages": [ + { + "name": "openssh-server", + "version": "*" + } + ], + "modules": [], + "groups": [], + "customizations": { + "user": [ + { + "name": "redhat", + "key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost" + } + ], + "subscription": { + "organization": 2040324, + "activation-key": "my-secret-key", + "server-url": "subscription.rhsm.redhat.com", + "base-url": "http://cdn.redhat.com", + "insights": true + } + } + }, "manifest": { "sources": { "org.osbuild.files": { diff --git a/test/cases/rhel_8-s390x-qcow2-boot.json b/test/cases/rhel_8-s390x-qcow2-boot.json index a426cec66..66dcedf59 100644 --- a/test/cases/rhel_8-s390x-qcow2-boot.json +++ b/test/cases/rhel_8-s390x-qcow2-boot.json @@ -33,6 +33,28 @@ } } }, + "blueprint": { + "name": "qcow2-boot-test", + "description": "Image for boot test", + "packages": [], + "modules": [], + "groups": [], + "customizations": { + "user": [ + { + "name": "redhat", + "key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost" + } + ], + "subscription": { + "organization": 2040324, + "activation-key": "my-secret-key", + "server-url": "subscription.rhsm.redhat.com", + "base-url": "http://cdn.redhat.com", + "insights": true + } + } + }, "manifest": { "sources": { "org.osbuild.files": { @@ -10885,4 +10907,4 @@ ], "timezone": "UTC" } -} \ No newline at end of file +} diff --git a/test/cases/rhel_8-s390x-tar-boot.json b/test/cases/rhel_8-s390x-tar-boot.json index b5c288556..cdc93240d 100644 --- a/test/cases/rhel_8-s390x-tar-boot.json +++ b/test/cases/rhel_8-s390x-tar-boot.json @@ -38,6 +38,33 @@ } } }, + "blueprint": { + "name": "tar-boot-test", + "description": "Image for boot test", + "packages": [ + { + "name": "openssh-server", + "version": "*" + } + ], + "modules": [], + "groups": [], + "customizations": { + "user": [ + { + "name": "redhat", + "key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost" + } + ], + "subscription": { + "organization": 2040324, + "activation-key": "my-secret-key", + "server-url": "subscription.rhsm.redhat.com", + "base-url": "http://cdn.redhat.com", + "insights": true + } + } + }, "manifest": { "sources": { "org.osbuild.files": { @@ -6274,4 +6301,4 @@ "1": "sha256:3d65a2da0ab6a7d04a62c84ff852eccb6641e864f6270a14fbc7a70cdc60ad76" } } -} \ No newline at end of file +} diff --git a/test/cases/rhel_8-x86_64-ami-boot.json b/test/cases/rhel_8-x86_64-ami-boot.json index 9896d71ca..95fbc019d 100644 --- a/test/cases/rhel_8-x86_64-ami-boot.json +++ b/test/cases/rhel_8-x86_64-ami-boot.json @@ -19,6 +19,17 @@ "filename": "image.raw", "blueprint": {} }, + "blueprint": { + "customizations": { + "subscription": { + "organization": 2040324, + "activation-key": "my-secret-key", + "server-url": "subscription.rhsm.redhat.com", + "base-url": "http://cdn.redhat.com", + "insights": true + } + } + }, "manifest": { "sources": { "org.osbuild.files": { @@ -9319,4 +9330,4 @@ ], "timezone": "UTC" } -} \ No newline at end of file +} diff --git a/test/cases/rhel_8-x86_64-openstack-boot.json b/test/cases/rhel_8-x86_64-openstack-boot.json index 277315d10..da5bfe480 100644 --- a/test/cases/rhel_8-x86_64-openstack-boot.json +++ b/test/cases/rhel_8-x86_64-openstack-boot.json @@ -33,6 +33,28 @@ } } }, + "blueprint": { + "name": "openstack-boot-test", + "description": "Image for boot test", + "packages": [], + "modules": [], + "groups": [], + "customizations": { + "user": [ + { + "name": "redhat", + "key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost" + } + ], + "subscription": { + "organization": 2040324, + "activation-key": "my-secret-key", + "server-url": "subscription.rhsm.redhat.com", + "base-url": "http://cdn.redhat.com", + "insights": true + } + } + }, "manifest": { "sources": { "org.osbuild.files": { @@ -9947,4 +9969,4 @@ ], "timezone": "UTC" } -} \ No newline at end of file +} diff --git a/test/cases/rhel_8-x86_64-qcow2-boot.json b/test/cases/rhel_8-x86_64-qcow2-boot.json index 937491d72..5177c8152 100644 --- a/test/cases/rhel_8-x86_64-qcow2-boot.json +++ b/test/cases/rhel_8-x86_64-qcow2-boot.json @@ -33,6 +33,28 @@ } } }, + "blueprint": { + "name": "qcow2-boot-test", + "description": "Image for boot test", + "packages": [], + "modules": [], + "groups": [], + "customizations": { + "user": [ + { + "name": "redhat", + "key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost" + } + ], + "subscription": { + "organization": 2040324, + "activation-key": "my-secret-key", + "server-url": "subscription.rhsm.redhat.com", + "base-url": "http://cdn.redhat.com", + "insights": true + } + } + }, "manifest": { "sources": { "org.osbuild.files": { @@ -10147,4 +10169,4 @@ ], "timezone": "UTC" } -} \ No newline at end of file +} diff --git a/test/cases/rhel_8-x86_64-rhel_edge_commit-boot.json b/test/cases/rhel_8-x86_64-rhel_edge_commit-boot.json index 9fd621046..63237b46c 100644 --- a/test/cases/rhel_8-x86_64-rhel_edge_commit-boot.json +++ b/test/cases/rhel_8-x86_64-rhel_edge_commit-boot.json @@ -16,6 +16,17 @@ "filename": "commit.tar", "blueprint": {} }, + "blueprint": { + "customizations": { + "subscription": { + "organization": 2040324, + "activation-key": "my-secret-key", + "server-url": "subscription.rhsm.redhat.com", + "base-url": "http://cdn.redhat.com", + "insights": true + } + } + }, "manifest": { "sources": { "org.osbuild.files": { @@ -9052,4 +9063,4 @@ "timezone": "UTC", "type": "ostree/commit" } -} \ No newline at end of file +} diff --git a/test/cases/rhel_8-x86_64-tar-boot.json b/test/cases/rhel_8-x86_64-tar-boot.json index cb123fbb6..243ab432c 100644 --- a/test/cases/rhel_8-x86_64-tar-boot.json +++ b/test/cases/rhel_8-x86_64-tar-boot.json @@ -38,6 +38,33 @@ } } }, + "blueprint": { + "name": "tar-boot-test", + "description": "Image for boot test", + "packages": [ + { + "name": "openssh-server", + "version": "*" + } + ], + "modules": [], + "groups": [], + "customizations": { + "user": [ + { + "name": "redhat", + "key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost" + } + ], + "subscription": { + "organization": 2040324, + "activation-key": "my-secret-key", + "server-url": "subscription.rhsm.redhat.com", + "base-url": "http://cdn.redhat.com", + "insights": true + } + } + }, "manifest": { "sources": { "org.osbuild.files": { @@ -5698,4 +5725,4 @@ ], "timezone": "UTC" } -} \ No newline at end of file +} diff --git a/test/cases/rhel_8-x86_64-vhd-boot.json b/test/cases/rhel_8-x86_64-vhd-boot.json index 525a38851..987dbcfc8 100644 --- a/test/cases/rhel_8-x86_64-vhd-boot.json +++ b/test/cases/rhel_8-x86_64-vhd-boot.json @@ -33,6 +33,28 @@ } } }, + "blueprint": { + "name": "vhd-boot-test", + "description": "Image for boot test", + "packages": [], + "modules": [], + "groups": [], + "customizations": { + "user": [ + { + "name": "redhat", + "key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost" + } + ], + "subscription": { + "organization": 2040324, + "activation-key": "my-secret-key", + "server-url": "subscription.rhsm.redhat.com", + "base-url": "http://cdn.redhat.com", + "insights": true + } + } + }, "manifest": { "sources": { "org.osbuild.files": { @@ -9857,4 +9879,4 @@ ], "timezone": "UTC" } -} \ No newline at end of file +} diff --git a/test/cases/rhel_8-x86_64-vmdk-boot.json b/test/cases/rhel_8-x86_64-vmdk-boot.json index a1b13a86d..eaee4fdc6 100644 --- a/test/cases/rhel_8-x86_64-vmdk-boot.json +++ b/test/cases/rhel_8-x86_64-vmdk-boot.json @@ -33,6 +33,28 @@ } ] }, + "blueprint": { + "name": "vhd-boot-test", + "description": "Image for boot test", + "packages": [], + "modules": [], + "groups": [], + "customizations": { + "user": [ + { + "name": "redhat", + "key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost" + } + ], + "subscription": { + "organization": 2040324, + "activation-key": "my-secret-key", + "server-url": "subscription.rhsm.redhat.com", + "base-url": "http://cdn.redhat.com", + "insights": true + } + } + }, "manifest": { "sources": { "org.osbuild.files": { @@ -9562,4 +9584,4 @@ ], "timezone": "UTC" } -} \ No newline at end of file +} diff --git a/tools/test-case-generators/format-request-map.json b/tools/test-case-generators/format-request-map.json index 7b0f9f6e4..2b3d00ac1 100644 --- a/tools/test-case-generators/format-request-map.json +++ b/tools/test-case-generators/format-request-map.json @@ -10,6 +10,21 @@ "repositories": [], "filename": "image.raw", "blueprint": {} + }, + "overrides": { + "rhel-8": { + "blueprint": { + "customizations": { + "subscription": { + "organization": 2040324, + "activation-key": "my-secret-key", + "server-url": "subscription.rhsm.redhat.com", + "base-url": "http://cdn.redhat.com", + "insights": true + } + } + } + } } }, "rhel-edge-commit": { @@ -20,6 +35,21 @@ "repositories": [], "filename": "commit.tar", "blueprint": {} + }, + "overrides": { + "rhel-8": { + "blueprint": { + "customizations": { + "subscription": { + "organization": 2040324, + "activation-key": "my-secret-key", + "server-url": "subscription.rhsm.redhat.com", + "base-url": "http://cdn.redhat.com", + "insights": true + } + } + } + } } }, "fedora-iot-commit": { @@ -57,6 +87,32 @@ ] } } + }, + "overrides": { + "rhel-8": { + "blueprint": { + "name": "openstack-boot-test", + "description": "Image for boot test", + "packages": [], + "modules": [], + "groups": [], + "customizations": { + "user": [ + { + "name": "redhat", + "key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost" + } + ], + "subscription": { + "organization": 2040324, + "activation-key": "my-secret-key", + "server-url": "subscription.rhsm.redhat.com", + "base-url": "http://cdn.redhat.com", + "insights": true + } + } + } + } } }, "tar": { @@ -89,6 +145,37 @@ ] } } + }, + "overrides": { + "rhel-8": { + "blueprint": { + "name": "tar-boot-test", + "description": "Image for boot test", + "packages": [ + { + "name": "openssh-server", + "version": "*" + } + ], + "modules": [], + "groups": [], + "customizations": { + "user": [ + { + "name": "redhat", + "key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost" + } + ], + "subscription": { + "organization": 2040324, + "activation-key": "my-secret-key", + "server-url": "subscription.rhsm.redhat.com", + "base-url": "http://cdn.redhat.com", + "insights": true + } + } + } + } } }, "qcow2": { @@ -116,6 +203,32 @@ ] } } + }, + "overrides": { + "rhel-8": { + "blueprint": { + "name": "qcow2-boot-test", + "description": "Image for boot test", + "packages": [], + "modules": [], + "groups": [], + "customizations": { + "user": [ + { + "name": "redhat", + "key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost" + } + ], + "subscription": { + "organization": 2040324, + "activation-key": "my-secret-key", + "server-url": "subscription.rhsm.redhat.com", + "base-url": "http://cdn.redhat.com", + "insights": true + } + } + } + } } }, "vhd": { @@ -143,6 +256,32 @@ ] } } + }, + "overrides": { + "rhel-8": { + "blueprint": { + "name": "vhd-boot-test", + "description": "Image for boot test", + "packages": [], + "modules": [], + "groups": [], + "customizations": { + "user": [ + { + "name": "redhat", + "key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost" + } + ], + "subscription": { + "organization": 2040324, + "activation-key": "my-secret-key", + "server-url": "subscription.rhsm.redhat.com", + "base-url": "http://cdn.redhat.com", + "insights": true + } + } + } + } } }, "vmdk": { @@ -169,6 +308,32 @@ ] } } + }, + "overrides": { + "rhel-8": { + "blueprint": { + "name": "vhd-boot-test", + "description": "Image for boot test", + "packages": [], + "modules": [], + "groups": [], + "customizations": { + "user": [ + { + "name": "redhat", + "key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost" + } + ], + "subscription": { + "organization": 2040324, + "activation-key": "my-secret-key", + "server-url": "subscription.rhsm.redhat.com", + "base-url": "http://cdn.redhat.com", + "insights": true + } + } + } + } } } } diff --git a/tools/test-case-generators/generate-test-cases b/tools/test-case-generators/generate-test-cases index 9cdb965ac..82be38863 100755 --- a/tools/test-case-generators/generate-test-cases +++ b/tools/test-case-generators/generate-test-cases @@ -207,13 +207,18 @@ def main(distro, arch, image_types, keep_image_info, store, output, with_customi return for output_format, test_case_request in format_request_dict.items(): - if test_case_request["compose-request"]["image-type"] not in image_types: + filtered_request = dict(filter(lambda i: i[0] != "overrides", test_case_request.items())) + if filtered_request["compose-request"]["image-type"] not in image_types: continue - test_case_request["compose-request"]["distro"] = distro - test_case_request["compose-request"]["arch"] = arch - test_case_request["compose-request"]["repositories"] = repos_dict[distro][arch] - generate_test_case("boot", distro, arch, output_format, test_case_request, keep_image_info, store, output) - + filtered_request["compose-request"]["distro"] = distro + filtered_request["compose-request"]["arch"] = arch + filtered_request["compose-request"]["repositories"] = repos_dict[distro][arch] + + if distro in test_case_request["overrides"]: + filtered_request.update(test_case_request["overrides"][distro]) + + generate_test_case("boot", distro, arch, output_format, filtered_request, keep_image_info, store, output) + return