Skip to content

Commit

Permalink
feat: switch mirror to HTTPS on get.jenkins.io (Jenkins WAR retrieval) (
Browse files Browse the repository at this point in the history
jenkins-infra#374)

* feat(infra) switch to the new mirror system in HTTPS - jenkins-infra/helpdesk#2888

Signed-off-by: Damien Duportal <[email protected]>

* cleanup(runAth) remove unused mirror variable

Signed-off-by: Damien Duportal <[email protected]>

* chore(README) typos

Signed-off-by: Damien Duportal <[email protected]>
  • Loading branch information
dduportal authored and smerle33 committed Jan 16, 2024
1 parent 7a5bda2 commit 2a2bdf9
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
8 changes: 4 additions & 4 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ infra.ensureInNode('docker,java') {

=== infra.stashJenkinsWar(jenkins, stashName)

Given a version of jenkins downloads it if neccesary and stashes it under the given name (which defaults to "jenkinsWar",
Given a version of jenkins downloads it if necessary and stashes it under the given name (which defaults to "jenkinsWar",
see the step doc for more documentation about he allowed versions

.Jenkinsfile
Expand Down Expand Up @@ -175,7 +175,7 @@ The docker image used for the environment where to run the ATH. Defaults to "jen
`metadataFile`::
A String indicating the file path (relative to where this step is executed) to use as metadata file for the build, more details about the metadata file are provided belows. *Defaults to `essentials.yml` at the location where this step is invoked*
`jenkins`::
URI to the jenkins.war, Jenkins version or one of "latest", "latest-rc", "lts" and "lts-rc". Defaults to "latest". For local war files use the file:// protocol in the URI. *Can be overriden from the metadata file*
URI to the jenkins.war, Jenkins version or one of "latest", "latest-rc", "lts" and "lts-rc". Defaults to "latest". For local war files use the file:// protocol in the URI. *Can be overridden from the metadata file*
`jdks`::
Java versions to use when running ATH. Defaults to 8. Only 8 and 11 are supported. *Can be overridden from the metadata file*
`configFile`::
Expand Down Expand Up @@ -319,7 +319,7 @@ The PCT revision to use in case that pctUrl points to a github destination, can
`metadataFile`::
A String indicating the file path (relative to where this step is executed) to use as metadata file for the build, more details about the metadata file are provided belows. *Defaults to `essentials.yml` at the location where this step is invoked*
`jenkins`::
URI to the jenkins.war, Jenkins version or one of "latest", "latest-rc", "lts" and "lts-rc". Defaults to "latest". For local war files use the file:// protocol in the URI. *Can be overriden from the metadata file*
URI to the jenkins.war, Jenkins version or one of "latest", "latest-rc", "lts" and "lts-rc". Defaults to "latest". For local war files use the file:// protocol in the URI. *Can be overridden from the metadata file*
`pctExtraOptions`::
List of extra PCT options to be passed to the PCT executable. Defaults to empty list.
`javaOptions`::
Expand All @@ -332,7 +332,7 @@ The PCT revision to use in case that pctUrl points to a github destination, can
.Step call example
[source,groovy]
----
runPCT(metadataFile:"metadata.yml", pctUrl:"docker://mynamspace/pct", jenkins: "2.110")
runPCT(metadataFile:"metadata.yml", pctUrl:"docker://mynamespace/pct", jenkins: "2.110")
----


Expand Down
2 changes: 1 addition & 1 deletion vars/infra.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ Object runWithJava(String command, String jdk = '8', List<String> extraEnv = nul
void stashJenkinsWar(String jenkins, String stashName = 'jenkinsWar') {
def isVersionNumber = (jenkins =~ /^\d+([.]\d+)*(-rc[0-9]+[.][0-9a-f]{12})?$/).matches()
def isLocalJenkins = jenkins.startsWith('file://')
def mirror = 'http://mirrors.jenkins.io/'
def mirror = 'https://get.jenkins.io/'

def jenkinsURL

Expand Down
1 change: 0 additions & 1 deletion vars/runATH.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ def call(Map params = [:]) {
def configFile = params.get('configFile', null)
def defaultJavaOptions = params.get('javaOptions', [])

def mirror = "http://mirrors.jenkins.io/"
def defaultCategory = "org.jenkinsci.test.acceptance.junit.SmokeTest"
def metadata
def athContainerImage
Expand Down

0 comments on commit 2a2bdf9

Please sign in to comment.