@@ -70,42 +70,43 @@ properties([
7070timestamps {
7171 library 'jenkins-ci-websphere'
7272
73+ // Perform Koji checkout FIRST on built-in node (for polling to work)
74+ stage('koji-fetch') {
75+ checkout([$class: 'KojiSCM',
76+ kojiBuildProviders: [[
77+ $class: 'KojiBuildProvider',
78+ topUrl: params.KOJI_TOP_URLS,
79+ downloadUrl: params.KOJI_DOWNLOAD_URLS
80+ ]],
81+ kojiXmlRpcApi: [
82+ $class: 'RealKojiXmlRpcApi',
83+ packageName: params.KOJI_PACKAGE_NAME,
84+ arch: params.KOJI_PACKAGE_ARCH, // may be comma-separated per plugin docs [3](https://docs.pagure.org/koji/image_build/)
85+ tag: params.KOJI_TAG,
86+ subpackageDenylist: params.KOJI_SUBPACKAGE_DENYLIST,
87+ subpackageAllowlist: params.KOJI_SUBPACKAGE_ALLOWLIST
88+ ],
89+ downloadDir: params.KOJI_DOWNLOAD_DIR,
90+ cleanDownloadDir: params.KOJI_CLEAN_DESTINATION,
91+ dirPerNvr: params.KOJI_CREATE_SUBDIR_PER_NVR,
92+ maxPreviousBuilds: params.KOJI_MAX_PREV_BUILDS as Integer
93+ ])
94+ }
95+
96+ // THEN check if we should skip (after polling has occurred)
7397 if (shouldSkipDueToSeedJob()) {
7498 return;
7599 }
100+
76101 println "Now you see me!"
77102 try {
78- println "Requesting node from " + params.ebcShortlist + " with demand ID " + params.executionId
103+ println "Requesting node from " + params.ebcShortlist + " with demand ID " + params.executionId
79104 onEBC(
80105 demandId: params.executionId,
81106 ebcShortlist: params.ebcShortlist,
82107 ebcPriority: params.ebcPriority,
83108 autoCompleteAfterXHours: 24
84109 ) {
85- stage('koji-fetch') {
86- reportActivity(name: 'koji-fetch', executionId: params.executionId) {
87- checkout([$class: 'KojiSCM',
88- kojiBuildProviders: [[
89- $class: 'KojiBuildProvider',
90- topUrl: params.KOJI_TOP_URLS,
91- downloadUrl: params.KOJI_DOWNLOAD_URLS
92- ]],
93- kojiXmlRpcApi: [
94- $class: 'RealKojiXmlRpcApi',
95- packageName: params.KOJI_PACKAGE_NAME,
96- arch: params.KOJI_PACKAGE_ARCH, // may be comma-separated per plugin docs [3](https://docs.pagure.org/koji/image_build/)
97- tag: params.KOJI_TAG,
98- subpackageDenylist: params.KOJI_SUBPACKAGE_DENYLIST,
99- subpackageAllowlist: params.KOJI_SUBPACKAGE_ALLOWLIST
100- ],
101- downloadDir: params.KOJI_DOWNLOAD_DIR,
102- cleanDownloadDir: params.KOJI_CLEAN_DESTINATION,
103- dirPerNvr: params.KOJI_CREATE_SUBDIR_PER_NVR,
104- maxPreviousBuilds: params.KOJI_MAX_PREV_BUILDS as Integer
105- ])
106- }
107- }
108-
109110 stage('testsuite-clone') {
110111 reportActivity(name: 'testsuite-clone', executionId: params.executionId) {
111112 println "Cloning the ${params.TEST_SUITE_URL} repo, branch ${params.TEST_SUITE_BRANCH}"
@@ -148,4 +149,3 @@ timestamps {
148149 }
149150 }
150151}
151-
0 commit comments