Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update version of Build Finder; store more information from the BuildFinder results #552

Merged
merged 4 commits into from
Nov 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@
<version.org.ec4j.maven.editorconfig-maven-plugin>0.1.0</version.org.ec4j.maven.editorconfig-maven-plugin>
<version.org.infinispan>13.0.10.Final</version.org.infinispan>
<version.org.jacoco>0.8.10</version.org.jacoco>
<version.org.jboss.pnc.build.finder>2.2.0</version.org.jboss.pnc.build.finder>
<version.org.jboss.pnc.pnc-api>2.4.6</version.org.jboss.pnc.pnc-api>
<version.org.jboss.pnc.build.finder>2.3.0</version.org.jboss.pnc.build.finder>
<version.org.jboss.pnc.pnc-api>2.4.9</version.org.jboss.pnc.pnc-api>
<version.org.jboss.resteasy>6.2.4.Final</version.org.jboss.resteasy>
<version.org.sonatype.plugins.nexus-staging-maven-plugin>1.6.13</version.org.sonatype.plugins.nexus-staging-maven-plugin>
<version.pnc.quarkus-logging-kafka>1.0.5</version.pnc.quarkus-logging-kafka>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ private static Collection<Artifact> createNotFoundArtifacts(KojiLocalArchive loc
localArchive.getArchive().setFilename(filename);

setCommonArtifactFields(builder, localArchive);
builder.archiveFilenames(List.of(filename)).archiveUnmatchedFilenames(localArchive.getUnmatchedFilenames());

artifacts.add(builder.build());
}
Expand Down Expand Up @@ -163,7 +164,7 @@ private static Build createBuild(
builder.brewId((long) kojiBuild.getBuildInfo().getId());
builder.brewNVR(kojiBuild.getBuildInfo().getNvr());
}
return builder.artifacts(artifacts).build();
return builder.isImport(kojiBuild.isImport()).artifacts(artifacts).build();
}

private static Artifact createArtifact(KojiLocalArchive localArchive, BuildSystem buildSystem, boolean imported) {
Expand Down Expand Up @@ -195,6 +196,8 @@ private static Artifact createArtifact(KojiLocalArchive localArchive, BuildSyste
builder.builtFromSource(localArchive.isBuiltFromSource() && !imported);

setCommonArtifactFields(builder, localArchive);
builder.archiveFilenames(localArchive.getFilenames())
.archiveUnmatchedFilenames(localArchive.getUnmatchedFilenames());

return builder.build();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"id" : "4f7c7a02-2c72-4c5e-9b25-52ed5515a9f0",
"name" : "",
"request" : {
"url" : "/",
"method" : "POST",
"bodyPatterns" : [ {
"equalToXml" : "<?xml version=\"1.0\" ?><methodCall><methodName>multiCall</methodName><params><param><value><array><data><value><struct><member><name>methodName</name><value><string>listArchives</string></value></member><member><name>params</name><value><array><data><value><struct><member><name>__starstar</name><value><boolean>1</boolean></value></member><member><name>checksum</name><value><string>${xmlunit.ignore}</string></value></member></struct></value></data></array></value></member></struct></value></data></array></value></param></params></methodCall>",
"enablePlaceholders": true
} ]
},
"response" : {
"status" : 200,
"body" : "<?xml version='1.0'?>\n<methodResponse>\n<params>\n<param>\n<value>\n<array>\n<data>\n<value>\n<array>\n<data>\n<value>\n<array>\n<data />\n</array>\n</value>\n</data>\n</array>\n</value>\n</data>\n</array>\n</value>\n</param>\n</params>\n</methodResponse>\n",
"headers" : {
"Date" : "Tue, 19 Jan 2021 10:08:00 GMT",
"Server" : "Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1c mod_auth_gssapi/1.6.1 mod_fcgid/2.3.9 mod_wsgi/4.6.4 Python/3.6",
"Keep-Alive" : "timeout=5, max=98",
"Content-Type" : "text/xml"
}
},
"uuid" : "4f7c7a02-2c72-4c5e-9b25-52ed5515a9f0",
"persistent" : true,
"insertionIndex" : 4
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"id" : "1a8d43e0-8660-4a46-a294-13ef36c6dd31",
"name" : "pnc-rest_v2_artifacts",
"request" : {
"url" : "/pnc-rest/v2/artifacts?pageSize=18&pageIndex=0&q=build%3Disnull%3Dfalse&md5=2b2ae0cf8ef48e7cad31f75552e7b695",
"url" : "/pnc-rest/v2/artifacts?pageSize=18&pageIndex=0&q=build%3Disnull%3Dfalse&sha256=6b0138885a6598965f9ac759efb20845e3c3bac1a8df812e2e0f9020d66d9e26",
"method" : "GET"
},
"response" : {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"id" : "203d62cf-30fb-4b86-9b04-ee15dffc9c17",
"name" : "pnc-rest_v2_artifacts",
"request" : {
"url" : "/pnc-rest/v2/artifacts?pageSize=18&pageIndex=0&q=build%3Disnull%3Dfalse&md5=28091f0ca08c8c68a97a85f6ff429727",
"url" : "/pnc-rest/v2/artifacts?pageSize=18&pageIndex=0&q=build%3Disnull%3Dfalse&sha256=106d62007ab85e7399d1684cba3d2cfb8b55a7daf5d7c7d473074c733db5bf9b",
"method" : "GET"
},
"response" : {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"id" : "2817c585-b607-4703-8ba3-8fc9e7ac664f",
"name" : "pnc-rest_v2_artifacts",
"request" : {
"url" : "/pnc-rest/v2/artifacts?pageSize=18&pageIndex=0&q=build%3Disnull%3Dfalse&md5=7d4c14e2272407c640c8ff4353def961",
"url" : "/pnc-rest/v2/artifacts?pageSize=18&pageIndex=0&q=build%3Disnull%3Dfalse&sha256=ae1565e4ce3d0b98a9a39a4121e5932cfef5f4ca443429addfad0ed351e1a2b1",
"method" : "GET"
},
"response" : {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"id" : "30014322-3311-4635-ba7d-876f65290b55",
"name" : "pnc-rest_v2_artifacts",
"request" : {
"url" : "/pnc-rest/v2/artifacts?pageSize=18&pageIndex=0&q=build%3Disnull%3Dfalse&md5=7d4c14e2272407c640c8ff4353def961",
"url" : "/pnc-rest/v2/artifacts?pageSize=18&pageIndex=0&q=build%3Disnull%3Dfalse&sha256=ae1565e4ce3d0b98a9a39a4121e5932cfef5f4ca443429addfad0ed351e1a2b1",
"method" : "GET"
},
"response" : {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"id" : "5c6b5295-910f-40f1-a232-7e89a57b99f0",
"name" : "pnc-rest_v2_artifacts",
"request" : {
"url" : "/pnc-rest/v2/artifacts?pageSize=18&pageIndex=0&q=build%3Disnull%3Dfalse&md5=fc97e71a3abc5b7876fc87f3d3be0988",
"url" : "/pnc-rest/v2/artifacts?pageSize=18&pageIndex=0&q=build%3Disnull%3Dfalse&sha256=6b30db33e0003be8e5cc033188fcd6a9b0acceb198ac73db3594f1ff972d3c71",
"method" : "GET"
},
"response" : {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"id" : "62dec8d8-fd06-457b-907d-9db0f944032e",
"name" : "pnc-rest_v2_artifacts",
"request" : {
"url" : "/pnc-rest/v2/artifacts?pageSize=18&pageIndex=0&q=build%3Disnull%3Dfalse&md5=2b2ae0cf8ef48e7cad31f75552e7b695",
"url" : "/pnc-rest/v2/artifacts?pageSize=18&pageIndex=0&q=build%3Disnull%3Dfalse&sha256=6b0138885a6598965f9ac759efb20845e3c3bac1a8df812e2e0f9020d66d9e26",
"method" : "GET"
},
"response" : {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"id" : "c0145195-a9c4-499e-bc2c-460aef3f71a1",
"name" : "pnc-rest_v2_artifacts",
"request" : {
"url" : "/pnc-rest/v2/artifacts?pageSize=18&pageIndex=0&q=build%3Disnull%3Dfalse&md5=28091f0ca08c8c68a97a85f6ff429727",
"url" : "/pnc-rest/v2/artifacts?pageSize=18&pageIndex=0&q=build%3Disnull%3Dfalse&sha256=106d62007ab85e7399d1684cba3d2cfb8b55a7daf5d7c7d473074c733db5bf9b",
"method" : "GET"
},
"response" : {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"id" : "c9095ab6-1f4f-4ac6-82c4-62da74bb3048",
"name" : "pnc-rest_v2_artifacts",
"request" : {
"url" : "/pnc-rest/v2/artifacts?pageSize=18&pageIndex=0&q=build%3Disnull%3Dfalse&md5=93ca942eea6f376a6ae83f34dead442e",
"url" : "/pnc-rest/v2/artifacts?pageSize=18&pageIndex=0&q=build%3Disnull%3Dfalse&sha256=7ffa90cadb9ad19225101b31737b916d2b61094f5695ffeaf4a143a6bc23165f",
"method" : "GET"
},
"response" : {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"id" : "cefe2e44-fdc4-4546-81ba-cfa670e3f814",
"name" : "pnc-rest_v2_artifacts",
"request" : {
"url" : "/pnc-rest/v2/artifacts?pageSize=18&pageIndex=0&q=build%3Disnull%3Dfalse&md5=5153ea9bdc6fff4576d641ad406d977e",
"url" : "/pnc-rest/v2/artifacts?pageSize=18&pageIndex=0&q=build%3Disnull%3Dfalse&sha256=63140a1d60c7ec30865ff66227762e95a2a54df8d2a9d65902b09d027894818c",
"method" : "GET"
},
"response" : {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"id" : "d50606fb-7536-4aa0-b680-4cb228ac0262",
"name" : "pnc-rest_v2_artifacts",
"request" : {
"url" : "/pnc-rest/v2/artifacts?pageSize=18&pageIndex=0&q=build%3Disnull%3Dfalse&md5=5153ea9bdc6fff4576d641ad406d977e",
"url" : "/pnc-rest/v2/artifacts?pageSize=18&pageIndex=0&q=build%3Disnull%3Dfalse&sha256=63140a1d60c7ec30865ff66227762e95a2a54df8d2a9d65902b09d027894818c",
"method" : "GET"
},
"response" : {
Expand Down