Skip to content

Commit

Permalink
Use OSRFCrendetialClass
Browse files Browse the repository at this point in the history
Signed-off-by: Jose Luis Rivero <[email protected]>
  • Loading branch information
j-rivero committed Nov 22, 2024
1 parent 314e0b8 commit f36bd6c
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 50 deletions.
19 changes: 0 additions & 19 deletions jenkins-scripts/dsl/_configs_/GitHubCredentials.groovy

This file was deleted.

19 changes: 0 additions & 19 deletions jenkins-scripts/dsl/_configs_/JenkinsAPICredentials.groovy

This file was deleted.

2 changes: 1 addition & 1 deletion jenkins-scripts/dsl/_configs_/OSRFReleasepy.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class OSRFReleasepy
{
// Base class for the job
OSRFUNIXBase.create(job)
GitHubCredentials.createOsrfbuildToken(job)
OSRFCredentials.setOSRFCrendentials(job, ['OSRFBUILD_JENKINS_TOKEN'])

job.with
{
Expand Down
2 changes: 1 addition & 1 deletion jenkins-scripts/dsl/ignition_collection.dsl
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ nightly_collection = gz_collections_yaml.collections

def nightly_scheduler_job = job("ignition-${gz_nightly}-nightly-scheduler")
OSRFUNIXBase.create(nightly_scheduler_job)
GitHubCredentials.createOsrfbuildToken(nightly_scheduler_job)

OSRFCredentials.setOSRFCrendentials(nightly_scheduler_job, [ 'OSRFBUILD_JENKINS_TOKEN' ])
nightly_scheduler_job.with
{
label Globals.nontest_label("master")
Expand Down
12 changes: 2 additions & 10 deletions jenkins-scripts/dsl/test.dsl
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,8 @@ test_credentials_token_job.with
# Warning: using verbose -v will reveal the token
# If the node permissions are blocking the trigger, be sure of enabling AGENT:BUILD permissions
# for OSRFBUILD_JENKINS_USER at Global security.
# If the node permissions are blocking the trigger, be sure of enabling AGENT:BUILD permissions
# for OSRFBUILD_JENKINS_USER at Global security.
curl -X POST --silent --fail --write '\\nReturn code: %{http_code}\\n' --user "\${OSRFBUILD_JENKINS_USER}:\${OSRFBUILD_JENKINS_TOKEN}" \${URL_TO_BUILD} --output /dev/null
""".stripIndent())

Expand Down Expand Up @@ -208,13 +210,3 @@ OSRFCredentials.allowOsrfbuildToRunTheBuild(test_dummy_job)
test_dummy_job.with {
label Globals.nontest_label("docker")
}

def test_dummy_job = job("_test_dummy_callable")
test_dummy_job.with {
label Globals.nontest_label("docker")

authorization {
permission('hudson.model.Item.Read', 'osrfbuild')
permission('hudson.model.Item.Build', 'osrfbuild')
}
}

0 comments on commit f36bd6c

Please sign in to comment.