diff --git a/e2e/tests/testdata/d980578d2e9b1869b6b1e22711c68c03f0751974_stable-4.2_amd64-production.json b/e2e/tests/testdata/b87e7c2782837a3538b0aa3dceb9e8133765ec81_stable-4.2_amd64-production.json similarity index 57% rename from e2e/tests/testdata/d980578d2e9b1869b6b1e22711c68c03f0751974_stable-4.2_amd64-production.json rename to e2e/tests/testdata/b87e7c2782837a3538b0aa3dceb9e8133765ec81_stable-4.2_amd64-production.json index be6247c87..93205f8e4 100644 --- a/e2e/tests/testdata/d980578d2e9b1869b6b1e22711c68c03f0751974_stable-4.2_amd64-production.json +++ b/e2e/tests/testdata/b87e7c2782837a3538b0aa3dceb9e8133765ec81_stable-4.2_amd64-production.json @@ -1,5 +1,45 @@ { "nodes": [ + { + "version": "4.1.20", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:a7e97365d16d8d920fedd3684b018b780337e069deb1dd8500e866c0d6110334", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.release.channels": "prerelease-4.1,stable-4.1,candidate-4.2,fast-4.2,stable-4.2", + "io.openshift.upgrades.graph.release.manifestref": "sha256:a7e97365d16d8d920fedd3684b018b780337e069deb1dd8500e866c0d6110334", + "url": "https://access.redhat.com/errata/RHBA-2019:3004" + } + }, + { + "version": "4.1.21", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:a68066e534c41010b3750f18d620abede491965d5b0e860f5717b626cde08e5b", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.release.channels": "prerelease-4.1,stable-4.1,candidate-4.2,fast-4.2,stable-4.2", + "io.openshift.upgrades.graph.release.manifestref": "sha256:a68066e534c41010b3750f18d620abede491965d5b0e860f5717b626cde08e5b", + "url": "https://access.redhat.com/errata/RHBA-2019:3152" + } + }, + { + "version": "4.1.22", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:31d3c3f2f3d3f9b40d6fde943d71ef823af3b3ceb41ea4fbcd6f428082a28872", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.release.channels": "prerelease-4.1,stable-4.1,candidate-4.2,fast-4.2,stable-4.2", + "io.openshift.upgrades.graph.release.manifestref": "sha256:31d3c3f2f3d3f9b40d6fde943d71ef823af3b3ceb41ea4fbcd6f428082a28872", + "url": "https://access.redhat.com/errata/RHBA-2019:3294" + } + }, + { + "version": "4.1.23", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:5dc1a2097ec0ecab4ef322c4e87bce93821c8ac9130a64ea3dc2f2bd8411a69c", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.release.channels": "prerelease-4.1,stable-4.1,candidate-4.2,fast-4.2,stable-4.2", + "io.openshift.upgrades.graph.release.manifestref": "sha256:5dc1a2097ec0ecab4ef322c4e87bce93821c8ac9130a64ea3dc2f2bd8411a69c", + "url": "https://access.redhat.com/errata/RHBA-2019:3766" + } + }, { "version": "4.1.24", "payload": "quay.io/openshift-release-dev/ocp-release@sha256:6f87fb66dfa907db03981e69474ea3069deab66358c18d965f6331bd727ff23f", @@ -10,6 +50,16 @@ "url": "https://access.redhat.com/errata/RHBA-2019:3875" } }, + { + "version": "4.1.25", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:5f824fa3b3c44c6a78a5fc6a77a82edc47cf2b495bb6b2b31e3e0a4d3d77684b", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.release.channels": "prerelease-4.1,stable-4.1,candidate-4.2,fast-4.2,stable-4.2", + "io.openshift.upgrades.graph.release.manifestref": "sha256:5f824fa3b3c44c6a78a5fc6a77a82edc47cf2b495bb6b2b31e3e0a4d3d77684b", + "url": "https://access.redhat.com/errata/RHBA-2019:3913" + } + }, { "version": "4.1.26", "payload": "quay.io/openshift-release-dev/ocp-release@sha256:3bc5f8bb2df578ea17e3d5ff5b9ae899a40fe16402b393abec0357f31eb85e58", @@ -80,12 +130,32 @@ "url": "https://access.redhat.com/errata/RHBA-2020:0399" } }, + { + "version": "4.1.38", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:89dc6820f6dd8b56983dccde5a3ca5aaebebd4a8703d77194eb7cea746129d0b", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.release.channels": "prerelease-4.1,stable-4.1,candidate-4.2,fast-4.2,stable-4.2", + "io.openshift.upgrades.graph.release.manifestref": "sha256:89dc6820f6dd8b56983dccde5a3ca5aaebebd4a8703d77194eb7cea746129d0b", + "url": "https://access.redhat.com/errata/RHBA-2020:0691" + } + }, + { + "version": "4.1.41", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:a8f706d139c8e77d884ccedbf67d69eefd67b66dcf69ee1032b507fe3acbf8c8", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.release.channels": "prerelease-4.1,stable-4.1,candidate-4.2,fast-4.2,stable-4.2", + "io.openshift.upgrades.graph.release.manifestref": "sha256:a8f706d139c8e77d884ccedbf67d69eefd67b66dcf69ee1032b507fe3acbf8c8", + "url": "https://access.redhat.com/errata/RHBA-2020:1446" + } + }, { "version": "4.2.0", "payload": "quay.io/openshift-release-dev/ocp-release@sha256:c5337afd85b94c93ec513f21c8545e3f9e36a227f55d41bc1dfb8fcc3f2be129", "metadata": { "description": "", - "io.openshift.upgrades.graph.previous.remove": "4.1.20", + "io.openshift.upgrades.graph.previous.remove_regex": "4\\.1\\..*", "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2", "io.openshift.upgrades.graph.release.manifestref": "sha256:c5337afd85b94c93ec513f21c8545e3f9e36a227f55d41bc1dfb8fcc3f2be129", "url": "https://access.redhat.com/errata/RHBA-2019:2922" @@ -96,7 +166,7 @@ "payload": "quay.io/openshift-release-dev/ocp-release@sha256:32f2e138c0c5af6183830a22801f627bedb414591332960b7c8506ba7f6d7bb6", "metadata": { "description": "", - "io.openshift.upgrades.graph.previous.remove": "*", + "io.openshift.upgrades.graph.previous.remove_regex": ".*", "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2", "io.openshift.upgrades.graph.release.manifestref": "sha256:32f2e138c0c5af6183830a22801f627bedb414591332960b7c8506ba7f6d7bb6", "url": "https://access.redhat.com/errata/RHBA-2019:3151" @@ -107,6 +177,7 @@ "payload": "quay.io/openshift-release-dev/ocp-release@sha256:dc782b44cac3d59101904cc5da2b9d8bdb90e55a07814df50ea7a13071b0f5f0", "metadata": { "description": "", + "io.openshift.upgrades.graph.previous.remove_regex": "4\\.1\\..*", "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2", "io.openshift.upgrades.graph.release.manifestref": "sha256:dc782b44cac3d59101904cc5da2b9d8bdb90e55a07814df50ea7a13071b0f5f0", "url": "https://access.redhat.com/errata/RHBA-2019:3151" @@ -117,6 +188,7 @@ "payload": "quay.io/openshift-release-dev/ocp-release@sha256:cebce35c054f1fb066a4dc0a518064945087ac1f3637fe23d2ee2b0c433d6ba8", "metadata": { "description": "", + "io.openshift.upgrades.graph.previous.remove_regex": "4\\.1\\..*", "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2", "io.openshift.upgrades.graph.release.manifestref": "sha256:cebce35c054f1fb066a4dc0a518064945087ac1f3637fe23d2ee2b0c433d6ba8", "url": "https://access.redhat.com/errata/RHBA-2019:3303" @@ -127,6 +199,7 @@ "payload": "quay.io/openshift-release-dev/ocp-release@sha256:bac62983757570b9b8f8bc84c740782984a255c16372b3e30cfc8b52c0a187b9", "metadata": { "description": "", + "io.openshift.upgrades.graph.previous.remove_regex": "4\\.1\\..*", "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2", "io.openshift.upgrades.graph.release.manifestref": "sha256:bac62983757570b9b8f8bc84c740782984a255c16372b3e30cfc8b52c0a187b9", "url": "https://access.redhat.com/errata/RHBA-2019:3869" @@ -137,6 +210,7 @@ "payload": "quay.io/openshift-release-dev/ocp-release@sha256:4bf307b98beba4d42da3316464013eac120c6e5a398646863ef92b0e2c621230", "metadata": { "description": "", + "io.openshift.upgrades.graph.previous.remove_regex": "4\\.1\\..*", "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2", "io.openshift.upgrades.graph.release.manifestref": "sha256:4bf307b98beba4d42da3316464013eac120c6e5a398646863ef92b0e2c621230", "url": "https://access.redhat.com/errata/RHBA-2019:3919" @@ -147,6 +221,7 @@ "payload": "quay.io/openshift-release-dev/ocp-release@sha256:f28cbabd1227352fe704a00df796a4511880174042dece96233036a10ac61639", "metadata": { "description": "", + "io.openshift.upgrades.graph.previous.remove_regex": "4\\.1\\..*", "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2", "io.openshift.upgrades.graph.release.manifestref": "sha256:f28cbabd1227352fe704a00df796a4511880174042dece96233036a10ac61639", "url": "https://access.redhat.com/errata/RHBA-2019:3953" @@ -157,6 +232,7 @@ "payload": "quay.io/openshift-release-dev/ocp-release@sha256:dc2e38fb00085d6b7f722475f8b7b758a0cb3a02ba42d9acf8a8298a6d510d9c", "metadata": { "description": "", + "io.openshift.upgrades.graph.previous.remove_regex": "4\\.1\\..*", "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2", "io.openshift.upgrades.graph.release.manifestref": "sha256:dc2e38fb00085d6b7f722475f8b7b758a0cb3a02ba42d9acf8a8298a6d510d9c", "url": "https://access.redhat.com/errata/RHBA-2019:4093" @@ -167,7 +243,7 @@ "payload": "quay.io/openshift-release-dev/ocp-release@sha256:49ee20ee3102b15a7cf4c019fd8875134fda41ccda1dc27b6e4483ded2aa8a5c", "metadata": { "description": "", - "io.openshift.upgrades.graph.previous.remove": "*", + "io.openshift.upgrades.graph.previous.remove_regex": ".*", "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2", "io.openshift.upgrades.graph.release.manifestref": "sha256:49ee20ee3102b15a7cf4c019fd8875134fda41ccda1dc27b6e4483ded2aa8a5c", "url": "https://access.redhat.com/errata/RHBA-2019:4181" @@ -178,6 +254,7 @@ "payload": "quay.io/openshift-release-dev/ocp-release@sha256:77ade34c373062c6a6c869e0e56ef93b2faaa373adadaac1430b29484a24d843", "metadata": { "description": "", + "io.openshift.upgrades.graph.previous.remove_regex": "4\\.1\\..*", "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2", "io.openshift.upgrades.graph.release.manifestref": "sha256:77ade34c373062c6a6c869e0e56ef93b2faaa373adadaac1430b29484a24d843", "url": "https://access.redhat.com/errata/RHBA-2019:4181" @@ -188,6 +265,7 @@ "payload": "quay.io/openshift-release-dev/ocp-release@sha256:782b41750f3284f3c8ee2c1f8cb896896da074e362cf8a472846356d1617752d", "metadata": { "description": "", + "io.openshift.upgrades.graph.previous.remove_regex": "4\\.1\\..*", "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2", "io.openshift.upgrades.graph.release.manifestref": "sha256:782b41750f3284f3c8ee2c1f8cb896896da074e362cf8a472846356d1617752d", "url": "https://access.redhat.com/errata/RHBA-2020:0014" @@ -198,6 +276,7 @@ "payload": "quay.io/openshift-release-dev/ocp-release@sha256:3fabe939da31f9a31f509251b9f73d321e367aba2d09ff392c2f452f6433a95a", "metadata": { "description": "", + "io.openshift.upgrades.graph.previous.remove_regex": "4\\.1\\..*", "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2", "io.openshift.upgrades.graph.release.manifestref": "sha256:3fabe939da31f9a31f509251b9f73d321e367aba2d09ff392c2f452f6433a95a", "url": "https://access.redhat.com/errata/RHBA-2020:0066" @@ -208,7 +287,8 @@ "payload": "quay.io/openshift-release-dev/ocp-release@sha256:e5a6e348721c38a78d9299284fbb5c60fb340135a86b674b038500bf190ad514", "metadata": { "description": "", - "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2,candidate-4.3,fast-4.3", + "io.openshift.upgrades.graph.previous.remove_regex": "4\\.1\\..*", + "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2,candidate-4.3,fast-4.3,stable-4.3", "io.openshift.upgrades.graph.release.manifestref": "sha256:e5a6e348721c38a78d9299284fbb5c60fb340135a86b674b038500bf190ad514", "url": "https://access.redhat.com/errata/RHBA-2020:0107" } @@ -218,7 +298,8 @@ "payload": "quay.io/openshift-release-dev/ocp-release@sha256:283a1625e18e0b6d7f354b1b022a0aeaab5598f2144ec484faf89e1ecb5c7498", "metadata": { "description": "", - "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2,candidate-4.3,fast-4.3", + "io.openshift.upgrades.graph.previous.remove_regex": "4\\.1\\..*", + "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2,candidate-4.3,fast-4.3,stable-4.3", "io.openshift.upgrades.graph.release.manifestref": "sha256:283a1625e18e0b6d7f354b1b022a0aeaab5598f2144ec484faf89e1ecb5c7498", "url": "https://access.redhat.com/errata/RHBA-2020:0395" } @@ -228,7 +309,8 @@ "payload": "quay.io/openshift-release-dev/ocp-release@sha256:b51a0c316bb0c11686e6b038ec7c9f7ff96763f47a53c3443ac82e8c054bc035", "metadata": { "description": "", - "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2,candidate-4.3,fast-4.3", + "io.openshift.upgrades.graph.previous.remove_regex": "4\\.1\\..*", + "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2,candidate-4.3,fast-4.3,stable-4.3", "io.openshift.upgrades.graph.release.manifestref": "sha256:b51a0c316bb0c11686e6b038ec7c9f7ff96763f47a53c3443ac82e8c054bc035", "url": "https://access.redhat.com/errata/RHBA-2020:0460" } @@ -238,6 +320,7 @@ "payload": "quay.io/openshift-release-dev/ocp-release@sha256:bd8aa8e0ce08002d4f8e73d6a2f9de5ae535a6a961ff6b8fdf2c52e4a14cc787", "metadata": { "description": "", + "io.openshift.upgrades.graph.previous.remove_regex": "4\\.1\\..*", "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2,candidate-4.3,fast-4.3,stable-4.3", "io.openshift.upgrades.graph.release.manifestref": "sha256:bd8aa8e0ce08002d4f8e73d6a2f9de5ae535a6a961ff6b8fdf2c52e4a14cc787", "url": "https://access.redhat.com/errata/RHBA-2020:0523" @@ -258,11 +341,72 @@ "payload": "quay.io/openshift-release-dev/ocp-release@sha256:81154f5c03294534e1eaf0319bef7a601134f891689ccede5d705ef659aa8c92", "metadata": { "description": "", - "io.openshift.upgrades.graph.previous.remove": "*", + "io.openshift.upgrades.graph.previous.remove_regex": ".*", "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2,candidate-4.3,fast-4.3,stable-4.3", "io.openshift.upgrades.graph.release.manifestref": "sha256:81154f5c03294534e1eaf0319bef7a601134f891689ccede5d705ef659aa8c92", "url": "https://access.redhat.com/errata/RHBA-2020:0685" } + }, + { + "version": "4.2.23", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:405077bc32c7228b403643cc5b47678c6b4fce98bc236e043169f784e325547c", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.previous.remove_regex": ".*", + "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2,candidate-4.3,fast-4.3,stable-4.3", + "io.openshift.upgrades.graph.release.manifestref": "sha256:405077bc32c7228b403643cc5b47678c6b4fce98bc236e043169f784e325547c", + "url": "https://access.redhat.com/errata/RHBA-2020:0787" + } + }, + { + "version": "4.2.25", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:dfbe59ca5dcc017475a0e1c703f51750c1bde63f12c725fbe4b7a599e36eb725", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2,candidate-4.3,fast-4.3,stable-4.3", + "io.openshift.upgrades.graph.release.manifestref": "sha256:dfbe59ca5dcc017475a0e1c703f51750c1bde63f12c725fbe4b7a599e36eb725", + "url": "https://access.redhat.com/errata/RHBA-2020:0826" + } + }, + { + "version": "4.2.26", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:af0a6384e787c820279a0954c804d9c27b13458df2de366b3cd5ec3a7cdaa4b2", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2,candidate-4.3,fast-4.3,stable-4.3", + "io.openshift.upgrades.graph.release.manifestref": "sha256:af0a6384e787c820279a0954c804d9c27b13458df2de366b3cd5ec3a7cdaa4b2", + "url": "https://access.redhat.com/errata/RHBA-2020:0936" + } + }, + { + "version": "4.2.27", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:26b501f5111add85989de9f02e368a0bfda8b43a54d0d56f4bf5916abada34da", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2,candidate-4.3,fast-4.3,stable-4.3", + "io.openshift.upgrades.graph.release.manifestref": "sha256:26b501f5111add85989de9f02e368a0bfda8b43a54d0d56f4bf5916abada34da", + "url": "https://access.redhat.com/errata/RHBA-2020:1263" + } + }, + { + "version": "4.2.28", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:c196196d04e08518f0b1ea2926c07643b4a0fd0c0b8940c1d541dacd803a6029", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2,candidate-4.3,fast-4.3,stable-4.3", + "io.openshift.upgrades.graph.release.manifestref": "sha256:c196196d04e08518f0b1ea2926c07643b4a0fd0c0b8940c1d541dacd803a6029", + "url": "https://access.redhat.com/errata/RHBA-2020:1398" + } + }, + { + "version": "4.2.29", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:3bff53ce2202ec59ed87581106b05f364fea0e7459f5806e4dc6e5129f130b36", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2,candidate-4.3,fast-4.3,stable-4.3", + "io.openshift.upgrades.graph.release.manifestref": "sha256:3bff53ce2202ec59ed87581106b05f364fea0e7459f5806e4dc6e5129f130b36", + "url": "https://access.redhat.com/errata/RHBA-2020:1450" + } } ], "edges": [ @@ -296,11 +440,11 @@ ], [ 0, - 12 + 8 ], [ 0, - 13 + 9 ], [ 1, @@ -328,7 +472,19 @@ ], [ 1, - 14 + 8 + ], + [ + 1, + 9 + ], + [ + 1, + 10 + ], + [ + 1, + 11 ], [ 2, @@ -352,7 +508,15 @@ ], [ 2, - 15 + 8 + ], + [ + 2, + 9 + ], + [ + 2, + 12 ], [ 3, @@ -372,7 +536,27 @@ ], [ 3, - 17 + 8 + ], + [ + 3, + 9 + ], + [ + 3, + 10 + ], + [ + 3, + 11 + ], + [ + 3, + 12 + ], + [ + 3, + 13 ], [ 4, @@ -388,7 +572,27 @@ ], [ 4, - 18 + 8 + ], + [ + 4, + 9 + ], + [ + 4, + 10 + ], + [ + 4, + 11 + ], + [ + 4, + 12 + ], + [ + 4, + 13 ], [ 5, @@ -400,7 +604,31 @@ ], [ 5, - 19 + 8 + ], + [ + 5, + 9 + ], + [ + 5, + 10 + ], + [ + 5, + 11 + ], + [ + 5, + 12 + ], + [ + 5, + 13 + ], + [ + 5, + 14 ], [ 6, @@ -408,51 +636,83 @@ ], [ 6, - 20 + 8 + ], + [ + 6, + 9 + ], + [ + 6, + 10 + ], + [ + 6, + 11 + ], + [ + 6, + 12 + ], + [ + 6, + 13 + ], + [ + 6, + 14 ], [ 7, - 21 + 8 ], [ 7, - 22 + 9 ], [ 7, - 23 + 10 ], [ 7, - 24 + 11 ], [ - 8, - 10 + 7, + 12 + ], + [ + 7, + 13 + ], + [ + 7, + 14 ], [ 8, - 12 + 9 ], [ 8, - 13 + 10 ], [ 8, - 14 + 11 ], [ 8, - 15 + 12 ], [ 8, - 17 + 13 ], [ 8, - 18 + 14 ], [ 9, @@ -460,39 +720,35 @@ ], [ 9, - 12 - ], - [ - 10, 11 ], [ - 10, + 9, 12 ], [ - 10, + 9, 13 ], [ - 10, + 9, 14 ], [ 10, - 15 + 11 ], [ 10, - 17 + 12 ], [ 10, - 18 + 13 ], [ 10, - 19 + 14 ], [ 11, @@ -507,125 +763,41 @@ 14 ], [ - 11, - 15 + 12, + 13 ], [ - 11, - 17 + 12, + 14 ], [ - 11, - 18 + 12, + 31 ], [ - 11, - 19 + 13, + 34 ], [ - 11, - 20 + 13, + 35 ], [ - 12, - 13 + 13, + 36 ], [ - 12, - 14 - ], - [ - 12, - 15 - ], - [ - 12, - 17 - ], - [ - 12, - 18 - ], - [ - 12, - 19 - ], - [ - 12, - 20 - ], - [ - 12, - 21 - ], - [ - 13, - 14 + 13, + 37 ], [ 13, - 15 - ], - [ - 13, - 17 - ], - [ - 13, - 18 - ], - [ - 13, - 19 - ], - [ - 13, - 20 - ], - [ - 13, - 21 - ], - [ - 14, - 15 - ], - [ - 14, - 17 - ], - [ - 14, - 18 - ], - [ - 14, - 19 - ], - [ - 14, - 20 - ], - [ - 14, - 21 - ], - [ - 14, - 23 - ], - [ - 14, - 24 + 38 ], [ 15, 17 ], - [ - 15, - 18 - ], [ 15, 19 @@ -644,19 +816,19 @@ ], [ 15, - 23 + 24 ], [ 15, - 24 + 25 ], [ 16, - 19 + 17 ], [ 16, - 20 + 19 ], [ 17, @@ -680,11 +852,15 @@ ], [ 17, - 23 + 24 + ], + [ + 17, + 25 ], [ 17, - 24 + 26 ], [ 18, @@ -704,11 +880,19 @@ ], [ 18, - 23 + 24 ], [ 18, - 24 + 25 + ], + [ + 18, + 26 + ], + [ + 18, + 27 ], [ 19, @@ -724,11 +908,23 @@ ], [ 19, - 23 + 24 ], [ 19, - 24 + 25 + ], + [ + 19, + 26 + ], + [ + 19, + 27 + ], + [ + 19, + 28 ], [ 20, @@ -740,11 +936,23 @@ ], [ 20, - 23 + 24 ], [ 20, - 24 + 25 + ], + [ + 20, + 26 + ], + [ + 20, + 27 + ], + [ + 20, + 28 ], [ 21, @@ -752,23 +960,363 @@ ], [ 21, - 23 + 24 + ], + [ + 21, + 25 ], [ 21, + 26 + ], + [ + 21, + 27 + ], + [ + 21, + 28 + ], + [ + 21, + 30 + ], + [ + 21, + 31 + ], + [ + 22, 24 ], [ 22, - 23 + 25 ], [ 22, - 24 + 26 + ], + [ + 22, + 27 + ], + [ + 22, + 28 + ], + [ + 22, + 29 + ], + [ + 22, + 30 + ], + [ + 22, + 31 ], [ 23, - 24 + 26 + ], + [ + 23, + 27 + ], + [ + 24, + 25 + ], + [ + 24, + 26 + ], + [ + 24, + 27 + ], + [ + 24, + 28 + ], + [ + 24, + 29 + ], + [ + 24, + 30 + ], + [ + 24, + 31 + ], + [ + 25, + 26 + ], + [ + 25, + 27 + ], + [ + 25, + 28 + ], + [ + 25, + 29 + ], + [ + 25, + 30 + ], + [ + 25, + 31 + ], + [ + 26, + 27 + ], + [ + 26, + 28 + ], + [ + 26, + 29 + ], + [ + 26, + 30 + ], + [ + 26, + 31 + ], + [ + 26, + 34 + ], + [ + 26, + 35 + ], + [ + 27, + 28 + ], + [ + 27, + 29 + ], + [ + 27, + 30 + ], + [ + 27, + 31 + ], + [ + 27, + 34 + ], + [ + 27, + 35 + ], + [ + 27, + 36 + ], + [ + 27, + 37 + ], + [ + 28, + 29 + ], + [ + 28, + 30 + ], + [ + 28, + 31 + ], + [ + 28, + 34 + ], + [ + 28, + 35 + ], + [ + 28, + 36 + ], + [ + 28, + 37 + ], + [ + 29, + 30 + ], + [ + 29, + 31 + ], + [ + 29, + 34 + ], + [ + 29, + 35 + ], + [ + 29, + 36 + ], + [ + 29, + 37 + ], + [ + 29, + 38 + ], + [ + 30, + 31 + ], + [ + 30, + 34 + ], + [ + 30, + 35 + ], + [ + 30, + 36 + ], + [ + 30, + 37 + ], + [ + 30, + 38 + ], + [ + 31, + 34 + ], + [ + 31, + 35 + ], + [ + 31, + 36 + ], + [ + 31, + 37 + ], + [ + 31, + 38 + ], + [ + 32, + 34 + ], + [ + 32, + 35 + ], + [ + 32, + 36 + ], + [ + 32, + 37 + ], + [ + 32, + 38 + ], + [ + 33, + 34 + ], + [ + 33, + 35 + ], + [ + 33, + 36 + ], + [ + 33, + 37 + ], + [ + 33, + 38 + ], + [ + 34, + 35 + ], + [ + 34, + 36 + ], + [ + 34, + 37 + ], + [ + 34, + 38 + ], + [ + 35, + 36 + ], + [ + 35, + 37 + ], + [ + 35, + 38 + ], + [ + 36, + 37 + ], + [ + 36, + 38 + ], + [ + 37, + 38 ] ] } diff --git a/e2e/tests/testdata/d980578d2e9b1869b6b1e22711c68c03f0751974_stable-4.2_s390x-production.json b/e2e/tests/testdata/b87e7c2782837a3538b0aa3dceb9e8133765ec81_stable-4.2_s390x-production.json similarity index 50% rename from e2e/tests/testdata/d980578d2e9b1869b6b1e22711c68c03f0751974_stable-4.2_s390x-production.json rename to e2e/tests/testdata/b87e7c2782837a3538b0aa3dceb9e8133765ec81_stable-4.2_s390x-production.json index 600492aa9..059000c2a 100644 --- a/e2e/tests/testdata/d980578d2e9b1869b6b1e22711c68c03f0751974_stable-4.2_s390x-production.json +++ b/e2e/tests/testdata/b87e7c2782837a3538b0aa3dceb9e8133765ec81_stable-4.2_s390x-production.json @@ -5,7 +5,7 @@ "payload": "quay.io/openshift-release-dev/ocp-release@sha256:96ba6acf8cbcb6863425ecdc006495ae43fbe2b7b55f6002f5a4c77ea6183373", "metadata": { "description": "", - "io.openshift.upgrades.graph.previous.remove": "*", + "io.openshift.upgrades.graph.previous.remove_regex": ".*", "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2", "io.openshift.upgrades.graph.release.manifestref": "sha256:96ba6acf8cbcb6863425ecdc006495ae43fbe2b7b55f6002f5a4c77ea6183373", "url": "https://access.redhat.com/errata/RHBA-2019:4181" @@ -16,6 +16,7 @@ "payload": "quay.io/openshift-release-dev/ocp-release@sha256:f1ef86861361140c69adca66278185c09eba12af80415208a2b0f9b014723f26", "metadata": { "description": "", + "io.openshift.upgrades.graph.previous.remove_regex": "4\\.1\\..*", "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2", "io.openshift.upgrades.graph.release.manifestref": "sha256:f1ef86861361140c69adca66278185c09eba12af80415208a2b0f9b014723f26", "url": "https://access.redhat.com/errata/RHBA-2019:4181" @@ -26,7 +27,7 @@ "payload": "quay.io/openshift-release-dev/ocp-release@sha256:5bbfbaf203e981a5783f1e73bedd41d2a35d69e11cf7d0d2de0becdd51a1fb1d", "metadata": { "description": "", - "io.openshift.upgrades.graph.previous.remove": "*", + "io.openshift.upgrades.graph.previous.remove_regex": ".*", "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2", "io.openshift.upgrades.graph.release.manifestref": "sha256:5bbfbaf203e981a5783f1e73bedd41d2a35d69e11cf7d0d2de0becdd51a1fb1d", "url": "https://access.redhat.com/errata/RHBA-2020:0014" @@ -37,6 +38,7 @@ "payload": "quay.io/openshift-release-dev/ocp-release@sha256:04b79afdbb41579e0f969bf23cdb16483dbfadbc09a6a0fec60b94328d68135a", "metadata": { "description": "", + "io.openshift.upgrades.graph.previous.remove_regex": "4\\.1\\..*", "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2", "io.openshift.upgrades.graph.release.manifestref": "sha256:04b79afdbb41579e0f969bf23cdb16483dbfadbc09a6a0fec60b94328d68135a", "url": "https://access.redhat.com/errata/RHBA-2020:0107" @@ -47,6 +49,7 @@ "payload": "quay.io/openshift-release-dev/ocp-release@sha256:260ada42ef59e8af11a885897f39f293e7e8b95c40d6a393196b7f0e2b826f0b", "metadata": { "description": "", + "io.openshift.upgrades.graph.previous.remove_regex": "4\\.1\\..*", "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2", "io.openshift.upgrades.graph.release.manifestref": "sha256:260ada42ef59e8af11a885897f39f293e7e8b95c40d6a393196b7f0e2b826f0b", "url": "https://access.redhat.com/errata/RHBA-2020:0395" @@ -57,6 +60,7 @@ "payload": "quay.io/openshift-release-dev/ocp-release@sha256:0b33c4263909b9e8960d3f3551466ab158d28dfd15fac661f0a717a70b804775", "metadata": { "description": "", + "io.openshift.upgrades.graph.previous.remove_regex": "4\\.1\\..*", "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2", "io.openshift.upgrades.graph.release.manifestref": "sha256:0b33c4263909b9e8960d3f3551466ab158d28dfd15fac661f0a717a70b804775", "url": "https://access.redhat.com/errata/RHBA-2020:0460" @@ -67,6 +71,7 @@ "payload": "quay.io/openshift-release-dev/ocp-release@sha256:4183c6acd0cc53f1ad4282cc04b4fda57ee2b504635016b3acb1464ea9775ccd", "metadata": { "description": "", + "io.openshift.upgrades.graph.previous.remove_regex": "4\\.1\\..*", "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2", "io.openshift.upgrades.graph.release.manifestref": "sha256:4183c6acd0cc53f1ad4282cc04b4fda57ee2b504635016b3acb1464ea9775ccd", "url": "https://access.redhat.com/errata/RHBA-2020:0523" @@ -87,11 +92,72 @@ "payload": "quay.io/openshift-release-dev/ocp-release@sha256:cc6aa448cccb6f7d15dd38eae0508fa4fcc1cc720a2d99bd79541cd620f7e5be", "metadata": { "description": "", - "io.openshift.upgrades.graph.previous.remove": "*", + "io.openshift.upgrades.graph.previous.remove_regex": ".*", "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2", "io.openshift.upgrades.graph.release.manifestref": "sha256:cc6aa448cccb6f7d15dd38eae0508fa4fcc1cc720a2d99bd79541cd620f7e5be", "url": "https://access.redhat.com/errata/RHBA-2020:0685" } + }, + { + "version": "4.2.23", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:1317e6bbabc07e1bbccc616f8f980c906d5fbdb3433435857b2d6145452cca86", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.previous.remove_regex": ".*", + "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2", + "io.openshift.upgrades.graph.release.manifestref": "sha256:1317e6bbabc07e1bbccc616f8f980c906d5fbdb3433435857b2d6145452cca86", + "url": "https://access.redhat.com/errata/RHBA-2020:0787" + } + }, + { + "version": "4.2.25", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:1b8a52790cbf52a33a8823decd798b2f722c281901641adaba55b7ddefa80cc4", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2", + "io.openshift.upgrades.graph.release.manifestref": "sha256:1b8a52790cbf52a33a8823decd798b2f722c281901641adaba55b7ddefa80cc4", + "url": "https://access.redhat.com/errata/RHBA-2020:0826" + } + }, + { + "version": "4.2.26", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:c55d34b05dd19131e688c869d448dc496a6baaadd734fd9dc61792eb2072078c", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2", + "io.openshift.upgrades.graph.release.manifestref": "sha256:c55d34b05dd19131e688c869d448dc496a6baaadd734fd9dc61792eb2072078c", + "url": "https://access.redhat.com/errata/RHBA-2020:0936" + } + }, + { + "version": "4.2.27", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:b3fa1f97466078845cfcec3e82856a145940cdaf83dec7565f052d2a96910571", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2", + "io.openshift.upgrades.graph.release.manifestref": "sha256:b3fa1f97466078845cfcec3e82856a145940cdaf83dec7565f052d2a96910571", + "url": "https://access.redhat.com/errata/RHBA-2020:1263" + } + }, + { + "version": "4.2.28", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:c1343fb4343b69d3ecc40f2272819455eaef4cafa5e1fe70fe90ffc09ff283f2", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2,candidate-4.3", + "io.openshift.upgrades.graph.release.manifestref": "sha256:c1343fb4343b69d3ecc40f2272819455eaef4cafa5e1fe70fe90ffc09ff283f2", + "url": "https://access.redhat.com/errata/RHBA-2020:1398" + } + }, + { + "version": "4.2.29", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:331f93003b8adea4ad3b0f78a37563102250e5f467dba455756fd6b3d31a6df4", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2,candidate-4.3", + "io.openshift.upgrades.graph.release.manifestref": "sha256:331f93003b8adea4ad3b0f78a37563102250e5f467dba455756fd6b3d31a6df4", + "url": "https://access.redhat.com/errata/RHBA-2020:1450" + } } ], "edges": [ @@ -147,6 +213,22 @@ 3, 7 ], + [ + 3, + 10 + ], + [ + 3, + 11 + ], + [ + 3, + 12 + ], + [ + 3, + 13 + ], [ 4, 5 @@ -159,6 +241,22 @@ 4, 7 ], + [ + 4, + 10 + ], + [ + 4, + 11 + ], + [ + 4, + 12 + ], + [ + 4, + 13 + ], [ 5, 6 @@ -167,9 +265,149 @@ 5, 7 ], + [ + 5, + 10 + ], + [ + 5, + 11 + ], + [ + 5, + 12 + ], + [ + 5, + 13 + ], + [ + 5, + 14 + ], [ 6, 7 + ], + [ + 6, + 10 + ], + [ + 6, + 11 + ], + [ + 6, + 12 + ], + [ + 6, + 13 + ], + [ + 6, + 14 + ], + [ + 7, + 10 + ], + [ + 7, + 11 + ], + [ + 7, + 12 + ], + [ + 7, + 13 + ], + [ + 7, + 14 + ], + [ + 8, + 10 + ], + [ + 8, + 11 + ], + [ + 8, + 12 + ], + [ + 8, + 13 + ], + [ + 8, + 14 + ], + [ + 9, + 10 + ], + [ + 9, + 11 + ], + [ + 9, + 12 + ], + [ + 9, + 13 + ], + [ + 9, + 14 + ], + [ + 10, + 11 + ], + [ + 10, + 12 + ], + [ + 10, + 13 + ], + [ + 10, + 14 + ], + [ + 11, + 12 + ], + [ + 11, + 13 + ], + [ + 11, + 14 + ], + [ + 12, + 13 + ], + [ + 12, + 14 + ], + [ + 13, + 14 ] ] } diff --git a/e2e/tests/testdata/b87e7c2782837a3538b0aa3dceb9e8133765ec81_stable-4.3_amd64-production.json b/e2e/tests/testdata/b87e7c2782837a3538b0aa3dceb9e8133765ec81_stable-4.3_amd64-production.json new file mode 100644 index 000000000..d4c355007 --- /dev/null +++ b/e2e/tests/testdata/b87e7c2782837a3538b0aa3dceb9e8133765ec81_stable-4.3_amd64-production.json @@ -0,0 +1,571 @@ +{ + "nodes": [ + { + "version": "4.2.16", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:e5a6e348721c38a78d9299284fbb5c60fb340135a86b674b038500bf190ad514", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.previous.remove_regex": "4\\.1\\..*", + "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2,candidate-4.3,fast-4.3,stable-4.3", + "io.openshift.upgrades.graph.release.manifestref": "sha256:e5a6e348721c38a78d9299284fbb5c60fb340135a86b674b038500bf190ad514", + "url": "https://access.redhat.com/errata/RHBA-2020:0107" + } + }, + { + "version": "4.2.18", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:283a1625e18e0b6d7f354b1b022a0aeaab5598f2144ec484faf89e1ecb5c7498", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.previous.remove_regex": "4\\.1\\..*", + "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2,candidate-4.3,fast-4.3,stable-4.3", + "io.openshift.upgrades.graph.release.manifestref": "sha256:283a1625e18e0b6d7f354b1b022a0aeaab5598f2144ec484faf89e1ecb5c7498", + "url": "https://access.redhat.com/errata/RHBA-2020:0395" + } + }, + { + "version": "4.2.19", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:b51a0c316bb0c11686e6b038ec7c9f7ff96763f47a53c3443ac82e8c054bc035", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.previous.remove_regex": "4\\.1\\..*", + "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2,candidate-4.3,fast-4.3,stable-4.3", + "io.openshift.upgrades.graph.release.manifestref": "sha256:b51a0c316bb0c11686e6b038ec7c9f7ff96763f47a53c3443ac82e8c054bc035", + "url": "https://access.redhat.com/errata/RHBA-2020:0460" + } + }, + { + "version": "4.2.20", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:bd8aa8e0ce08002d4f8e73d6a2f9de5ae535a6a961ff6b8fdf2c52e4a14cc787", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.previous.remove_regex": "4\\.1\\..*", + "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2,candidate-4.3,fast-4.3,stable-4.3", + "io.openshift.upgrades.graph.release.manifestref": "sha256:bd8aa8e0ce08002d4f8e73d6a2f9de5ae535a6a961ff6b8fdf2c52e4a14cc787", + "url": "https://access.redhat.com/errata/RHBA-2020:0523" + } + }, + { + "version": "4.2.21", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:6c57b48ec03382d9d63c529d4665d133969573966400515777f36dd592ad834a", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2,candidate-4.3,fast-4.3,stable-4.3", + "io.openshift.upgrades.graph.release.manifestref": "sha256:6c57b48ec03382d9d63c529d4665d133969573966400515777f36dd592ad834a", + "url": "https://access.redhat.com/errata/RHBA-2020:0614" + } + }, + { + "version": "4.2.22", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:81154f5c03294534e1eaf0319bef7a601134f891689ccede5d705ef659aa8c92", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.previous.remove_regex": ".*", + "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2,candidate-4.3,fast-4.3,stable-4.3", + "io.openshift.upgrades.graph.release.manifestref": "sha256:81154f5c03294534e1eaf0319bef7a601134f891689ccede5d705ef659aa8c92", + "url": "https://access.redhat.com/errata/RHBA-2020:0685" + } + }, + { + "version": "4.2.23", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:405077bc32c7228b403643cc5b47678c6b4fce98bc236e043169f784e325547c", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.previous.remove_regex": ".*", + "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2,candidate-4.3,fast-4.3,stable-4.3", + "io.openshift.upgrades.graph.release.manifestref": "sha256:405077bc32c7228b403643cc5b47678c6b4fce98bc236e043169f784e325547c", + "url": "https://access.redhat.com/errata/RHBA-2020:0787" + } + }, + { + "version": "4.2.25", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:dfbe59ca5dcc017475a0e1c703f51750c1bde63f12c725fbe4b7a599e36eb725", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2,candidate-4.3,fast-4.3,stable-4.3", + "io.openshift.upgrades.graph.release.manifestref": "sha256:dfbe59ca5dcc017475a0e1c703f51750c1bde63f12c725fbe4b7a599e36eb725", + "url": "https://access.redhat.com/errata/RHBA-2020:0826" + } + }, + { + "version": "4.2.26", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:af0a6384e787c820279a0954c804d9c27b13458df2de366b3cd5ec3a7cdaa4b2", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2,candidate-4.3,fast-4.3,stable-4.3", + "io.openshift.upgrades.graph.release.manifestref": "sha256:af0a6384e787c820279a0954c804d9c27b13458df2de366b3cd5ec3a7cdaa4b2", + "url": "https://access.redhat.com/errata/RHBA-2020:0936" + } + }, + { + "version": "4.2.27", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:26b501f5111add85989de9f02e368a0bfda8b43a54d0d56f4bf5916abada34da", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2,candidate-4.3,fast-4.3,stable-4.3", + "io.openshift.upgrades.graph.release.manifestref": "sha256:26b501f5111add85989de9f02e368a0bfda8b43a54d0d56f4bf5916abada34da", + "url": "https://access.redhat.com/errata/RHBA-2020:1263" + } + }, + { + "version": "4.2.28", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:c196196d04e08518f0b1ea2926c07643b4a0fd0c0b8940c1d541dacd803a6029", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2,candidate-4.3,fast-4.3,stable-4.3", + "io.openshift.upgrades.graph.release.manifestref": "sha256:c196196d04e08518f0b1ea2926c07643b4a0fd0c0b8940c1d541dacd803a6029", + "url": "https://access.redhat.com/errata/RHBA-2020:1398" + } + }, + { + "version": "4.2.29", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:3bff53ce2202ec59ed87581106b05f364fea0e7459f5806e4dc6e5129f130b36", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2,candidate-4.3,fast-4.3,stable-4.3", + "io.openshift.upgrades.graph.release.manifestref": "sha256:3bff53ce2202ec59ed87581106b05f364fea0e7459f5806e4dc6e5129f130b36", + "url": "https://access.redhat.com/errata/RHBA-2020:1450" + } + }, + { + "version": "4.3.0", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:3a516480dfd68e0f87f702b4d7bdd6f6a0acfdac5cd2e9767b838ceede34d70d", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.previous.remove_regex": ".*", + "io.openshift.upgrades.graph.release.channels": "candidate-4.3,fast-4.3,stable-4.3", + "io.openshift.upgrades.graph.release.manifestref": "sha256:3a516480dfd68e0f87f702b4d7bdd6f6a0acfdac5cd2e9767b838ceede34d70d", + "url": "https://access.redhat.com/errata/RHBA-2020:0062" + } + }, + { + "version": "4.3.1", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:ea7ac3ad42169b39fce07e5e53403a028644810bee9a212e7456074894df40f3", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.previous.remove_regex": ".*", + "io.openshift.upgrades.graph.release.channels": "candidate-4.3,fast-4.3,stable-4.3", + "io.openshift.upgrades.graph.release.manifestref": "sha256:ea7ac3ad42169b39fce07e5e53403a028644810bee9a212e7456074894df40f3", + "url": "https://access.redhat.com/errata/RHBA-2020:0391" + } + }, + { + "version": "4.3.2", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:cadf53e7181639f6cc77d2430339102db2908de330210c1ff8c7a7dc1cb0e550", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.previous.remove_regex": ".*", + "io.openshift.upgrades.graph.release.channels": "candidate-4.3,fast-4.3,stable-4.3", + "io.openshift.upgrades.graph.release.manifestref": "sha256:cadf53e7181639f6cc77d2430339102db2908de330210c1ff8c7a7dc1cb0e550", + "url": "https://access.redhat.com/errata/RHBA-2020:0492" + } + }, + { + "version": "4.3.3", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:9b8708b67dd9b7720cb7ab3ed6d12c394f689cc8927df0e727c76809ab383f44", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.previous.remove_regex": ".*", + "io.openshift.upgrades.graph.release.channels": "candidate-4.3,fast-4.3,stable-4.3", + "io.openshift.upgrades.graph.release.manifestref": "sha256:9b8708b67dd9b7720cb7ab3ed6d12c394f689cc8927df0e727c76809ab383f44", + "url": "https://access.redhat.com/errata/RHBA-2020:0528" + } + }, + { + "version": "4.3.5", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:64320fbf95d968fc6b9863581a92d373bc75f563a13ae1c727af37450579f61a", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.previous.remove_regex": ".*", + "io.openshift.upgrades.graph.release.channels": "candidate-4.3,fast-4.3,stable-4.3,candidate-4.4", + "io.openshift.upgrades.graph.release.manifestref": "sha256:64320fbf95d968fc6b9863581a92d373bc75f563a13ae1c727af37450579f61a", + "url": "https://access.redhat.com/errata/RHBA-2020:0676" + } + }, + { + "version": "4.3.8", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:a414f6308db72f88e9d2e95018f0cc4db71c6b12b2ec0f44587488f0a16efc42", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.previous.remove_regex": ".*", + "io.openshift.upgrades.graph.release.channels": "candidate-4.3,fast-4.3,stable-4.3,candidate-4.4", + "io.openshift.upgrades.graph.release.manifestref": "sha256:a414f6308db72f88e9d2e95018f0cc4db71c6b12b2ec0f44587488f0a16efc42", + "url": "https://access.redhat.com/errata/RHBA-2020:0858" + } + }, + { + "version": "4.3.9", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:f0fada3c8216dc17affdd3375ff845b838ef9f3d67787d3d42a88dcd0f328eea", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.previous.remove_regex": ".*", + "io.openshift.upgrades.graph.release.channels": "candidate-4.3,fast-4.3,stable-4.3,candidate-4.4", + "io.openshift.upgrades.graph.release.manifestref": "sha256:f0fada3c8216dc17affdd3375ff845b838ef9f3d67787d3d42a88dcd0f328eea", + "url": "https://access.redhat.com/errata/RHBA-2020:0930" + } + }, + { + "version": "4.3.10", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:edb4364367cff4f751ffdc032bc830a469548f998127b523047a8dd518c472cd", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.previous.remove_regex": ".*", + "io.openshift.upgrades.graph.release.channels": "candidate-4.3,fast-4.3,stable-4.3,candidate-4.4", + "io.openshift.upgrades.graph.release.manifestref": "sha256:edb4364367cff4f751ffdc032bc830a469548f998127b523047a8dd518c472cd", + "url": "https://access.redhat.com/errata/RHBA-2020:1262" + } + }, + { + "version": "4.3.12", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:75e8f20e9d5a8fcf5bba4b8f7d17057463e222e350bcfc3cf7ea2c47f7d8ba5d", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.previous.remove_regex": ".*", + "io.openshift.upgrades.graph.release.channels": "candidate-4.3,fast-4.3,stable-4.3,candidate-4.4,fast-4.4,stable-4.4", + "io.openshift.upgrades.graph.release.manifestref": "sha256:75e8f20e9d5a8fcf5bba4b8f7d17057463e222e350bcfc3cf7ea2c47f7d8ba5d", + "url": "https://access.redhat.com/errata/RHBA-2020:1393" + } + }, + { + "version": "4.3.13", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:e1ebc7295248a8394afb8d8d918060a7cc3de12c491283b317b80b26deedfe61", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.release.channels": "candidate-4.3,fast-4.3,stable-4.3,candidate-4.4,fast-4.4,stable-4.4", + "io.openshift.upgrades.graph.release.manifestref": "sha256:e1ebc7295248a8394afb8d8d918060a7cc3de12c491283b317b80b26deedfe61", + "url": "https://access.redhat.com/errata/RHBA-2020:1482" + } + }, + { + "version": "4.3.18", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:1f0fd38ac0640646ab8e7fec6821c8928341ad93ac5ca3a48c513ab1fb63bc4b", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.release.channels": "candidate-4.3,fast-4.3,stable-4.3,candidate-4.4,fast-4.4,stable-4.4", + "io.openshift.upgrades.graph.release.manifestref": "sha256:1f0fd38ac0640646ab8e7fec6821c8928341ad93ac5ca3a48c513ab1fb63bc4b", + "url": "https://access.redhat.com/errata/RHBA-2020:1529" + } + } + ], + "edges": [ + [ + 0, + 1 + ], + [ + 0, + 2 + ], + [ + 0, + 3 + ], + [ + 0, + 4 + ], + [ + 0, + 7 + ], + [ + 0, + 8 + ], + [ + 0, + 9 + ], + [ + 0, + 10 + ], + [ + 1, + 2 + ], + [ + 1, + 3 + ], + [ + 1, + 4 + ], + [ + 1, + 7 + ], + [ + 1, + 8 + ], + [ + 1, + 9 + ], + [ + 1, + 10 + ], + [ + 2, + 3 + ], + [ + 2, + 4 + ], + [ + 2, + 7 + ], + [ + 2, + 8 + ], + [ + 2, + 9 + ], + [ + 2, + 10 + ], + [ + 2, + 11 + ], + [ + 3, + 4 + ], + [ + 3, + 7 + ], + [ + 3, + 8 + ], + [ + 3, + 9 + ], + [ + 3, + 10 + ], + [ + 3, + 11 + ], + [ + 4, + 7 + ], + [ + 4, + 8 + ], + [ + 4, + 9 + ], + [ + 4, + 10 + ], + [ + 4, + 11 + ], + [ + 4, + 22 + ], + [ + 5, + 7 + ], + [ + 5, + 8 + ], + [ + 5, + 9 + ], + [ + 5, + 10 + ], + [ + 5, + 11 + ], + [ + 5, + 22 + ], + [ + 6, + 7 + ], + [ + 6, + 8 + ], + [ + 6, + 9 + ], + [ + 6, + 10 + ], + [ + 6, + 11 + ], + [ + 6, + 22 + ], + [ + 7, + 8 + ], + [ + 7, + 9 + ], + [ + 7, + 10 + ], + [ + 7, + 11 + ], + [ + 7, + 22 + ], + [ + 8, + 9 + ], + [ + 8, + 10 + ], + [ + 8, + 11 + ], + [ + 8, + 22 + ], + [ + 9, + 10 + ], + [ + 9, + 11 + ], + [ + 9, + 22 + ], + [ + 10, + 11 + ], + [ + 10, + 22 + ], + [ + 11, + 21 + ], + [ + 11, + 22 + ], + [ + 12, + 22 + ], + [ + 13, + 21 + ], + [ + 13, + 22 + ], + [ + 14, + 21 + ], + [ + 14, + 22 + ], + [ + 15, + 21 + ], + [ + 15, + 22 + ], + [ + 16, + 21 + ], + [ + 16, + 22 + ], + [ + 17, + 21 + ], + [ + 17, + 22 + ], + [ + 18, + 21 + ], + [ + 18, + 22 + ], + [ + 19, + 21 + ], + [ + 19, + 22 + ], + [ + 20, + 21 + ], + [ + 20, + 22 + ], + [ + 21, + 22 + ] + ] +} diff --git a/e2e/tests/testdata/b87e7c2782837a3538b0aa3dceb9e8133765ec81_stable-4.3_s390x-production.json b/e2e/tests/testdata/b87e7c2782837a3538b0aa3dceb9e8133765ec81_stable-4.3_s390x-production.json new file mode 100644 index 000000000..07a02b13e --- /dev/null +++ b/e2e/tests/testdata/b87e7c2782837a3538b0aa3dceb9e8133765ec81_stable-4.3_s390x-production.json @@ -0,0 +1,15 @@ +{ + "nodes": [ + { + "version": "4.3.18", + "payload": "quay.io/openshift-release-dev/ocp-release@sha256:dd5263b63a86ca6ac68e185bf6102c6e9ae4be2d0a00a0fb768c32a788787ee7", + "metadata": { + "description": "", + "io.openshift.upgrades.graph.release.channels": "candidate-4.3,fast-4.3,stable-4.3,candidate-4.4,fast-4.4,stable-4.4", + "io.openshift.upgrades.graph.release.manifestref": "sha256:dd5263b63a86ca6ac68e185bf6102c6e9ae4be2d0a00a0fb768c32a788787ee7", + "url": "https://access.redhat.com/errata/RHBA-2020:1529" + } + } + ], + "edges": [] +} diff --git a/e2e/tests/testdata/d980578d2e9b1869b6b1e22711c68c03f0751974_stable-4.3_amd64-production.json b/e2e/tests/testdata/d980578d2e9b1869b6b1e22711c68c03f0751974_stable-4.3_amd64-production.json deleted file mode 100644 index 435bfe3ff..000000000 --- a/e2e/tests/testdata/d980578d2e9b1869b6b1e22711c68c03f0751974_stable-4.3_amd64-production.json +++ /dev/null @@ -1,99 +0,0 @@ -{ - "nodes": [ - { - "version": "4.2.20", - "payload": "quay.io/openshift-release-dev/ocp-release@sha256:bd8aa8e0ce08002d4f8e73d6a2f9de5ae535a6a961ff6b8fdf2c52e4a14cc787", - "metadata": { - "description": "", - "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2,candidate-4.3,fast-4.3,stable-4.3", - "io.openshift.upgrades.graph.release.manifestref": "sha256:bd8aa8e0ce08002d4f8e73d6a2f9de5ae535a6a961ff6b8fdf2c52e4a14cc787", - "url": "https://access.redhat.com/errata/RHBA-2020:0523" - } - }, - { - "version": "4.2.21", - "payload": "quay.io/openshift-release-dev/ocp-release@sha256:6c57b48ec03382d9d63c529d4665d133969573966400515777f36dd592ad834a", - "metadata": { - "description": "", - "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2,candidate-4.3,fast-4.3,stable-4.3", - "io.openshift.upgrades.graph.release.manifestref": "sha256:6c57b48ec03382d9d63c529d4665d133969573966400515777f36dd592ad834a", - "url": "https://access.redhat.com/errata/RHBA-2020:0614" - } - }, - { - "version": "4.2.22", - "payload": "quay.io/openshift-release-dev/ocp-release@sha256:81154f5c03294534e1eaf0319bef7a601134f891689ccede5d705ef659aa8c92", - "metadata": { - "description": "", - "io.openshift.upgrades.graph.previous.remove": "*", - "io.openshift.upgrades.graph.release.channels": "candidate-4.2,fast-4.2,stable-4.2,candidate-4.3,fast-4.3,stable-4.3", - "io.openshift.upgrades.graph.release.manifestref": "sha256:81154f5c03294534e1eaf0319bef7a601134f891689ccede5d705ef659aa8c92", - "url": "https://access.redhat.com/errata/RHBA-2020:0685" - } - }, - { - "version": "4.3.0", - "payload": "quay.io/openshift-release-dev/ocp-release@sha256:3a516480dfd68e0f87f702b4d7bdd6f6a0acfdac5cd2e9767b838ceede34d70d", - "metadata": { - "description": "", - "io.openshift.upgrades.graph.previous.remove": "4.2.16", - "io.openshift.upgrades.graph.release.channels": "candidate-4.3,fast-4.3,stable-4.3", - "io.openshift.upgrades.graph.release.manifestref": "sha256:3a516480dfd68e0f87f702b4d7bdd6f6a0acfdac5cd2e9767b838ceede34d70d", - "url": "https://access.redhat.com/errata/RHBA-2020:0062" - } - }, - { - "version": "4.3.1", - "payload": "quay.io/openshift-release-dev/ocp-release@sha256:ea7ac3ad42169b39fce07e5e53403a028644810bee9a212e7456074894df40f3", - "metadata": { - "description": "", - "io.openshift.upgrades.graph.release.channels": "candidate-4.3,fast-4.3,stable-4.3", - "io.openshift.upgrades.graph.release.manifestref": "sha256:ea7ac3ad42169b39fce07e5e53403a028644810bee9a212e7456074894df40f3", - "url": "https://access.redhat.com/errata/RHBA-2020:0391" - } - }, - { - "version": "4.3.2", - "payload": "quay.io/openshift-release-dev/ocp-release@sha256:cadf53e7181639f6cc77d2430339102db2908de330210c1ff8c7a7dc1cb0e550", - "metadata": { - "description": "", - "io.openshift.upgrades.graph.previous.remove": "*", - "io.openshift.upgrades.graph.release.channels": "candidate-4.3,fast-4.3,stable-4.3", - "io.openshift.upgrades.graph.release.manifestref": "sha256:cadf53e7181639f6cc77d2430339102db2908de330210c1ff8c7a7dc1cb0e550", - "url": "https://access.redhat.com/errata/RHBA-2020:0492" - } - }, - { - "version": "4.3.3", - "payload": "quay.io/openshift-release-dev/ocp-release@sha256:9b8708b67dd9b7720cb7ab3ed6d12c394f689cc8927df0e727c76809ab383f44", - "metadata": { - "description": "", - "io.openshift.upgrades.graph.previous.remove": "*", - "io.openshift.upgrades.graph.release.channels": "candidate-4.3,fast-4.3,stable-4.3", - "io.openshift.upgrades.graph.release.manifestref": "sha256:9b8708b67dd9b7720cb7ab3ed6d12c394f689cc8927df0e727c76809ab383f44", - "url": "https://access.redhat.com/errata/RHBA-2020:0528" - } - }, - { - "version": "4.3.5", - "payload": "quay.io/openshift-release-dev/ocp-release@sha256:64320fbf95d968fc6b9863581a92d373bc75f563a13ae1c727af37450579f61a", - "metadata": { - "description": "", - "io.openshift.upgrades.graph.previous.remove": "*", - "io.openshift.upgrades.graph.release.channels": "candidate-4.3,fast-4.3,stable-4.3,candidate-4.4", - "io.openshift.upgrades.graph.release.manifestref": "sha256:64320fbf95d968fc6b9863581a92d373bc75f563a13ae1c727af37450579f61a", - "url": "https://access.redhat.com/errata/RHBA-2020:0676" - } - } - ], - "edges": [ - [ - 0, - 1 - ], - [ - 3, - 4 - ] - ] -} diff --git a/e2e/tests/testdata/d980578d2e9b1869b6b1e22711c68c03f0751974_stable-4.3_s390x-production.json b/e2e/tests/testdata/d980578d2e9b1869b6b1e22711c68c03f0751974_stable-4.3_s390x-production.json deleted file mode 100644 index ecb371883..000000000 --- a/e2e/tests/testdata/d980578d2e9b1869b6b1e22711c68c03f0751974_stable-4.3_s390x-production.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "nodes": [], - "edges": [] -} diff --git a/e2e/tests/testdata/metadata_revision b/e2e/tests/testdata/metadata_revision index ff0b0d618..08308f6a3 100644 --- a/e2e/tests/testdata/metadata_revision +++ b/e2e/tests/testdata/metadata_revision @@ -1 +1 @@ -d980578d2e9b1869b6b1e22711c68c03f0751974 +b87e7c2782837a3538b0aa3dceb9e8133765ec81