Merge pull request #94 from jpopelka/buildInfo

Add getBuildInfo() step

README.md

@@ -24,9 +24,11 @@ This is a list of all steps implemented in the library. Click on a particular st
 * [buildId2taskId()](./docs/steps/buildId2taskId.md)
 * [buildImageAndPushToRegistry()](./docs/steps/buildImageAndPushToRegistry.md)
 * [getArtifactType()](./docs/steps/getArtifactType.md)
+* [getBuildInfo()](./docs/steps/getBuildInfo.md)
 * [getGatingRequirements()](./docs/steps/getGatingRequirements.md)
 * [getGitUrl()](./docs/steps/getGitUrl.md)
 * [getReleaseIdFromBranch()](./docs/steps/getReleaseIdFromBranch.md)
+* [getTaskInfo()](./docs/steps/getTaskInfo.md)
 * [gzip()](./docs/steps/gzip.md)
 * [isScratchBuild()](./docs/steps/isScratchBuild.md)
 * [isProduction()](./docs/steps/isProduction.md)

docs/steps/getBuildInfo.md

@@ -0,0 +1,13 @@
+# getBuildInfo() step
+
+Return information about given Koji build.
+
+## Parameters
+
+* **buildId**: integer; Koji build ID
+
+## Example Usage
+
+```groovy
+def buildInfo = getBuildInfo(2615024)
+```

pom.xml

@@ -20,7 +20,7 @@
         <repository>
             <id>jenkins-releases</id>
             <name>Jenkins Releases</name>
-            <url>http://repo.jenkins-ci.org/releases</url>
+            <url>https://repo.jenkins-ci.org/releases</url>
         </repository>
     </repositories>
 

src/org/fedoraproject/jenkins/Utils.groovy

@@ -2,6 +2,7 @@ package org.fedoraproject.jenkins
 
 import groovy.json.JsonSlurperClassic
 import groovy.json.JsonBuilder
+import groovy.xml.XmlSlurper
 import java.time.Instant
 import java.security.MessageDigest
 import java.util.zip.GZIPInputStream

src/org/fedoraproject/jenkins/koji/Koji.groovy

@@ -181,6 +181,7 @@ class Koji implements Serializable {
             taskInfo.version = version
             taskInfo.release = release
             taskInfo.nvr = nvr
+            taskInfo.buildId = null
         }
 
         return taskInfo

test/groovy/org/fedoraproject/jenkins/koji/KojiTest.groovy

@@ -54,6 +54,25 @@ class KojiTest extends BasePipelineTest {
         assertEquals 'git+https://src.fedoraproject.org/rpms/python-requests.git#f9d62a3fa1306bd3744f29b4a4136adfc3de6603', taskInfo.source.raw
     }
 
+    @Test
+    void getBuildInfoTest() {
+        Koji koji = new Koji()
+
+        // https://koji.fedoraproject.org/koji/buildinfo?buildID=2615024
+        def buildInfo = koji.getBuildInfo(2615024)
+
+        assertNotNull buildInfo
+        assertFalse buildInfo.scratch
+        assertEquals 'rpmlint-2.6.1-1.fc42', buildInfo.nvr
+        assertEquals 'rpmlint', buildInfo.name
+        assertEquals 'rpmlint', buildInfo.packageName
+        assertEquals '2.6.1', buildInfo.version
+        assertEquals '1.fc42', buildInfo.release
+        assertEquals 'churchyard', buildInfo.ownerName
+        assertEquals '127834990', buildInfo.taskId
+        assertThat(buildInfo.tags).contains('f42')
+    }
+
     @Test
     void getNonExistentTaskInfoTest() {
         Koji koji = new Koji()

vars/getBuildInfo.groovy

@@ -0,0 +1,27 @@
+#!/usr/bin/groovy
+
+import org.fedoraproject.jenkins.koji.Koji
+
+
+/**
+ * getBuildInfo() step.
+ */
+def call(buildId) {
+    def koji = new Koji(env.KOJI_API_URL)
+    def buildInfo = koji.getBuildInfo(buildId.toInteger())
+
+    // TODO: we can do this mapping directly in BuildInfo class
+    def buildInfoMap = [
+        'id': buildInfo.id,
+        'nvr': buildInfo.nvr
+        'name': buildInfo.name,
+        'packageName': buildInfo.packageName,
+        'version': buildInfo.version,
+        'release': buildInfo.release,
+        'ownerName': buildInfo.ownerName,
+        'taskId': buildInfo.taskId,
+        'tags': buildInfo.tags
+    ]
+
+    return buildInfoMap
+}

vars/getTaskInfo.groovy

@@ -22,6 +22,7 @@ def call(taskId) {
         'version': taskInfo.version,
         'release': taskInfo.release,
         'nvr': taskInfo.nvr
+        'buildId': taskInfo.buildId
     ]
 
     return taskInfoMap