| |
@@ -0,0 +1,93 @@
|
| |
+ // Build an empty module that buildrequires a virtual stream
|
| |
+
|
| |
+ def runTests() {
|
| |
+ def clientcert = ca.get_ssl_cert("mbs-${TEST_ID}-koji-admin")
|
| |
+ koji.setConfig("https://koji-${TEST_ID}-hub/kojihub", "https://koji-${TEST_ID}-hub/kojifiles",
|
| |
+ clientcert.cert, clientcert.key, ca.get_ca_cert().cert)
|
| |
+ def tags = koji.callMethod("listTags")
|
| |
+ if (!tags.any { it.name == "module-f28" }) {
|
| |
+ koji.addTag("module-f28")
|
| |
+ }
|
| |
+ if (!tags.any { it.name == "module-f28-build" }) {
|
| |
+ koji.addTag("module-f28-build", "--parent=module-f28", "--arches=x86_64")
|
| |
+ }
|
| |
+ try {
|
| |
+ // There's currently no way to query whether a given user has CG access, so just add it
|
| |
+ // and hope no one else has already done it.
|
| |
+ koji.runCmd("grant-cg-access", "mbs-${TEST_ID}-koji-admin", "module-build-service", "--new")
|
| |
+ } catch (ex) {
|
| |
+ echo "Granting cg-access to mbs-${TEST_ID}-koji-admin failed, assuming it was already provided in a previous test"
|
| |
+ }
|
| |
+
|
| |
+ if (!koji.callMethod("listBTypes").any { it.name == "module" }) {
|
| |
+ koji.callMethodLogin("addBType", "module")
|
| |
+ }
|
| |
+
|
| |
+ def testmodule = """
|
| |
+ document: modulemd
|
| |
+ version: 1
|
| |
+ data:
|
| |
+ summary: A test module in all its beautiful beauty
|
| |
+ description: This module buildrequires a virtual stream of the platform module
|
| |
+ name: testmodule
|
| |
+ stream: buildrequire_virtual_stream
|
| |
+ license:
|
| |
+ module: [ MIT ]
|
| |
+ dependencies:
|
| |
+ buildrequires:
|
| |
+ platform: fedora
|
| |
+ requires:
|
| |
+ platform: fedora
|
| |
+ references:
|
| |
+ community: https://docs.pagure.org/modularity/
|
| |
+ documentation: https://fedoraproject.org/wiki/Fedora_Packaging_Guidelines_for_Modules
|
| |
+ """
|
| |
+
|
| |
+ def buildparams = """
|
| |
+ {"modulemd": "${testmodule}",
|
| |
+ "owner": "mbs-${TEST_ID}-koji-admin"}
|
| |
+ """
|
| |
+ def resp = httpRequest(
|
| |
+ httpMode: "POST",
|
| |
+ url: "https://mbs-${TEST_ID}-frontend/module-build-service/1/module-builds/",
|
| |
+ acceptType: "APPLICATION_JSON",
|
| |
+ contentType: "APPLICATION_JSON",
|
| |
+ requestBody: buildparams,
|
| |
+ ignoreSslErrors: true,
|
| |
+ )
|
| |
+ if (resp.status != 201) {
|
| |
+ echo "Response code was ${resp.status}, output was ${resp.content}"
|
| |
+ error "POST response code was ${resp.status}, not 201"
|
| |
+ }
|
| |
+ def buildinfo = readJSON(text: resp.content)
|
| |
+ timeout(10) {
|
| |
+ waitUntil {
|
| |
+ resp = httpRequest(
|
| |
+ url: "https://mbs-${TEST_ID}-frontend/module-build-service/1/module-builds/${buildinfo.id}",
|
| |
+ ignoreSslErrors: true,
|
| |
+ )
|
| |
+ if (resp.status != 200) {
|
| |
+ echo "Response code was ${resp.status}, output was ${resp.content}"
|
| |
+ error "GET response code was ${resp.status}, not 200"
|
| |
+ }
|
| |
+ def modinfo = readJSON(text: resp.content)
|
| |
+ if (modinfo.state_name == "failed") {
|
| |
+ error "Module ${modinfo.id} (${modinfo.name}) is in the ${modinfo.state_name} state"
|
| |
+ } else if (modinfo.state_name != "ready") {
|
| |
+ echo "Module ${modinfo.id} (${modinfo.name}) is in the ${modinfo.state_name} state, not ready"
|
| |
+ return false
|
| |
+ }
|
| |
+ def br_platform_stream = modinfo.buildrequires.platform.stream
|
| |
+ if (br_platform_stream != "f28") {
|
| |
+ echo "Module ${modinfo.id} (${modinfo.name}) buildrequires platform:${br_platform_stream}, \
|
| |
+ but it should buildrequire platform:f28"
|
| |
+ return false
|
| |
+ }
|
| |
+
|
| |
+ echo "All checks passed"
|
| |
+ return true
|
| |
+ }
|
| |
+ }
|
| |
+ }
|
| |
+
|
| |
+ return this;
|
| |
mprahl
commented 4 years ago
The old way performed a
DISTINCT (module_builds.id)on the original query passed in toModuleBuild._add_virtual_streams_filter, but this caused issues when the original query was ordered by something other than ID on Postgres databases. This new approach uses a subquery to filter that module builds with the desired virtual streams, and then joins this subquery to the original query.This also casts the version to an integer for proper sorting in
get_last_builds_in_stream_version_lte.