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.

Sign up for GitHub

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

Jump to bottom

Fix and simplify buildStatus step #1066

Merged
merged 6 commits into from
Apr 3, 2021
Merged

Fix and simplify buildStatus step #1066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
45296dc
Add logging
cachedout Apr 2, 2021
97569f8
Modify logging
cachedout Apr 2, 2021
1250c85
Modify logging
cachedout Apr 2, 2021
723727b
Modify logging
cachedout Apr 2, 2021
01adebe
Use standard HTTP request step
cachedout Apr 2, 2021
8134ac8
Migrate to httpRequest
cachedout Apr 2, 2021
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
27 changes: 2 additions & 25 deletions src/test/groovy/BuildStatusTests.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,51 +19,28 @@ import org.junit.Before
import org.junit.After
import org.junit.Test
import static org.junit.Assert.assertTrue
import com.sun.net.httpserver.HttpServer
import com.sun.net.httpserver.HttpContext
import com.sun.net.httpserver.HttpExchange
import com.sun.net.httpserver.HttpHandler

class BuildStatusTests extends ApmBasePipelineTest {


// Build a small test server
def i = new InetSocketAddress('localhost', 9999)
def HttpServer ws = HttpServer.create(i, 100)
HttpContext job_status_context = ws.createContext("/buildStatus/text")


@Override
@Before
void setUp() throws Exception {
super.setUp()
script = loadScript('vars/buildStatus.groovy')
job_status_context.setHandler({ exchange ->
String response = "Success"
exchange.responseHeaders.set("Content-Type", "text/plain;charset=utf-8")
exchange.sendResponseHeaders(200, response.getBytes().length);
OutputStream os = exchange.getResponseBody();
os.write(response.getBytes());
os.close();
exchange.Send
});
ws.start()
}

@After
void tearDown() throws Exception {
ws.stop(0)
}

@Test
void test() throws Exception {
helper.registerAllowedMethod("httpRequest", [Map.class], { "Success" })
def result = script.call(host: 'localhost:9999', job: ['apm-agent-java', 'apm-agent-java-mbp', 'master'], ssl: false)
assertTrue("Success" == result)
assertJobStatusSuccess()
}

@Test
void testBoolSuccess() throws Exception {
helper.registerAllowedMethod("httpRequest", [Map.class], { "Success" })
def result = script.call(host: 'localhost:9999', job: ['apm-agent-java', 'apm-agent-java-mbp', 'master'], return_boolean: true, ssl: false)
assertTrue(result)
}
Expand Down
29 changes: 2 additions & 27 deletions vars/buildStatus.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,33 +25,7 @@ buildStatus(
**/

import java.net.URL
import java.net.HttpURLConnection

import java.io.BufferedReader
import java.io.InputStreamReader


private static String makeRequest(URL url) throws IOException {
// URL url = new URL("${baseUrl}/${path}")
HttpURLConnection con = (HttpURLConnection)url.openConnection()
con.setRequestMethod("GET")
con.setRequestProperty("User-Agent", "Jenkins Build Status/1.0")
int responseCode = con.getResponseCode()

InputStreamReader isr = new InputStreamReader(con.getInputStream())
BufferedReader brd = new BufferedReader(isr)
if (responseCode == HttpURLConnection.HTTP_OK) {
String inputLine
StringBuffer response = new StringBuffer()
while ((inputLine = brd.readLine()) != null) {
response.append(inputLine)
}
brd.close()
return response.toString()
} else {
raise IOException("Failure to connect to Jenkins instance")
}
}

private static URL constructURL(String host, ArrayList job, boolean ssl) throws Exception {
String delim = "%2F"
Expand All @@ -71,7 +45,8 @@ def call(Map args = [:]) {
def job = args.get('job', [])
def return_boolean = args.get('return_boolean', false)
def ssl = args.get('ssl', true)
def result = makeRequest(constructURL(host, job, ssl))
def to_url = constructURL(host, job, ssl).toString()
def result = httpRequest(url: to_url)
if (return_boolean){
if (result == "Success") {
return true
Expand Down