Airship modify github url var

Allows to pass the whole repo url for verifications
and specify the credentials to use in Github.

Change-Id: I1eed3a63496bd712a749305709f712875e1a9f55

diff --git a/jjb/airship/defaults.yml b/jjb/airship/defaults.yml
index f41a72fe08bc11b7e96fdd855328ef4e117880ef..0466ac353f6487928fd0569454380c68487f170b 100644 (file)
--- a/jjb/airship/defaults.yml
+++ b/jjb/airship/defaults.yml
@@ -29,7 +29,7 @@
     job_prefix: 'airship'
     ci_github_jenkins_credentials_id: 'nordix-airship-ci-github-prod-token'
     ci_ghprb_auth_id: 'e8a43847-46ff-42db-a5db-7366df0e4ee2'
-    ci_github_repo: 'Nordix/airship-dev-tools'
+    ci_github_repo: 'https://github.com/Nordix/airship-dev-tools.git'
     ci_github_admin_user: 'nordixinfra'
     ci_github_whitelist_org:
     - nordix-airship

diff --git a/jjb/airship/job_capi_bm_integration_tests_centos.yml b/jjb/airship/job_capi_bm_integration_tests_centos.yml
index b0cab355f386f39e8174abdcd05158c9cf51ed20..72d552ccc348f9303962a46d05d796205ac447ad 100644 (file)
--- a/jjb/airship/job_capi_bm_integration_tests_centos.yml
+++ b/jjb/airship/job_capi_bm_integration_tests_centos.yml
@@ -45,6 +45,10 @@
         name: ghprbActualCommit
         default: 'master'
         description: 'CI Repo branch for triggering manual build'
+    - string:
+        name: ghprbAuthorRepoGitUrl
+        default: 'https://github.com/{repo[org]}/{repo[name]}.git'
+        description: 'CI Repo URL for triggering manual build'
     - string:
         name: DISTRIBUTION
         default: 'centos'
@@ -96,7 +100,7 @@
     pipeline-scm:
       scm:
       - git:
-          url: https://github.com/{ci_github_repo}.git
+          url: "{ci_github_repo}"
           credentials-id: "{ci_github_jenkins_credentials_id}"
           branches:
             - '{branch|master}'

diff --git a/jjb/airship/job_capi_bm_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_integration_tests_ubuntu.yml
index 2b0f79a486b3698c8b11343bec6134c4b243ebb7..f4203cf3e2ee78df91ae4a4d29a3614110eff089 100644 (file)
--- a/jjb/airship/job_capi_bm_integration_tests_ubuntu.yml
+++ b/jjb/airship/job_capi_bm_integration_tests_ubuntu.yml
@@ -45,6 +45,10 @@
         name: ghprbActualCommit
         default: 'master'
         description: 'CI Repo branch for triggering manual build'
+    - string:
+        name: ghprbAuthorRepoGitUrl
+        default: 'https://github.com/{repo[org]}/{repo[name]}.git'
+        description: 'CI Repo URL for triggering manual build'
     - string:
         name: DISTRIBUTION
         default: 'ubuntu'
@@ -96,7 +100,7 @@
     pipeline-scm:
       scm:
       - git:
-          url: https://github.com/{ci_github_repo}.git
+          url: "{ci_github_repo}"
           credentials-id: "{ci_github_jenkins_credentials_id}"
           branches:
             - '{branch|master}'

diff --git a/jjb/airship/job_capi_bm_master_integration_tests_centos.yml b/jjb/airship/job_capi_bm_master_integration_tests_centos.yml
index 3211f0f0aef0c25c0e2ae6e9dcfa6b0e43630ab8..9bcbd7e1f436815c675e22b244e2b91bba14df63 100644 (file)
--- a/jjb/airship/job_capi_bm_master_integration_tests_centos.yml
+++ b/jjb/airship/job_capi_bm_master_integration_tests_centos.yml
@@ -79,7 +79,7 @@
     pipeline-scm:
       scm:
       - git:
-          url: https://github.com/{ci_github_repo}.git
+          url: "{ci_github_repo}"
           credentials-id: "{ci_github_jenkins_credentials_id}"
           branches:
             - '{branch|master}'

diff --git a/jjb/airship/job_capi_bm_master_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_master_integration_tests_ubuntu.yml
index 3a1356abf671eb813a62df9088e7361c752d8e5a..f389cdd60994d26b6428f08b81879e309d3c14be 100644 (file)
--- a/jjb/airship/job_capi_bm_master_integration_tests_ubuntu.yml
+++ b/jjb/airship/job_capi_bm_master_integration_tests_ubuntu.yml
@@ -79,7 +79,7 @@
     pipeline-scm:
       scm:
       - git:
-          url: https://github.com/{ci_github_repo}.git
+          url: "{ci_github_repo}"
           credentials-id: "{ci_github_jenkins_credentials_id}"
           branches:
             - '{branch|master}'

diff --git a/jjb/airship/job_capi_bm_unit_tests.yml b/jjb/airship/job_capi_bm_unit_tests.yml
index f7983d13030f0803192810eed5ca546201056c6d..fa027f806f06f7ee71cd169f3ef877f1a6358748 100644 (file)
--- a/jjb/airship/job_capi_bm_unit_tests.yml
+++ b/jjb/airship/job_capi_bm_unit_tests.yml
@@ -79,7 +79,7 @@
     pipeline-scm:
       scm:
       - git:
-          url: https://github.com/{ci_github_repo}.git
+          url: "{ci_github_repo}"
           credentials-id: "{ci_github_jenkins_credentials_id}"
           branches:
             - '{branch|master}'

diff --git a/jjb/airship/job_capi_bm_v1a2_integration_tests_centos.yml b/jjb/airship/job_capi_bm_v1a2_integration_tests_centos.yml
index 7a5cab0168ef0a52ad0ce11ea1fc96d60b340d7d..abcd6df3c9452250aea0f584c98d6934750df41f 100644 (file)
--- a/jjb/airship/job_capi_bm_v1a2_integration_tests_centos.yml
+++ b/jjb/airship/job_capi_bm_v1a2_integration_tests_centos.yml
@@ -45,6 +45,10 @@
         name: ghprbActualCommit
         default: 'master'
         description: 'CI Repo branch for triggering manual build'
+    - string:
+        name: ghprbAuthorRepoGitUrl
+        default: 'https://github.com/{repo[org]}/{repo[name]}.git'
+        description: 'CI Repo URL for triggering manual build'
     - string:
         name: DISTRIBUTION
         default: 'centos'
@@ -96,7 +100,7 @@
     pipeline-scm:
       scm:
       - git:
-          url: https://github.com/{ci_github_repo}.git
+          url: "{ci_github_repo}"
           credentials-id: "{ci_github_jenkins_credentials_id}"
           branches:
             - '{branch|master}'

diff --git a/jjb/airship/job_capi_bm_v1a2_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_v1a2_integration_tests_ubuntu.yml
index 2b7686759f00c3964f6c28c640c3b71dcfc68126..db091171ec2218bf86dbde64cd3567aba2c05229 100644 (file)
--- a/jjb/airship/job_capi_bm_v1a2_integration_tests_ubuntu.yml
+++ b/jjb/airship/job_capi_bm_v1a2_integration_tests_ubuntu.yml
@@ -45,6 +45,10 @@
         name: ghprbActualCommit
         default: 'master'
         description: 'CI Repo branch for triggering manual build'
+    - string:
+        name: ghprbAuthorRepoGitUrl
+        default: 'https://github.com/{repo[org]}/{repo[name]}.git'
+        description: 'CI Repo URL for triggering manual build'
     - string:
         name: DISTRIBUTION
         default: 'ubuntu'
@@ -96,7 +100,7 @@
     pipeline-scm:
       scm:
       - git:
-          url: https://github.com/{ci_github_repo}.git
+          url: "{ci_github_repo}"
           credentials-id: "{ci_github_jenkins_credentials_id}"
           branches:
             - '{branch|master}'

diff --git a/jjb/airship/job_capi_bm_v1a2_master_integration_tests_centos.yml b/jjb/airship/job_capi_bm_v1a2_master_integration_tests_centos.yml
index 966739959e0b8deb7b0f1cd0076d2f409568dcf8..efdd1dee1db093754a7e34b39c5e26c04157b66b 100644 (file)
--- a/jjb/airship/job_capi_bm_v1a2_master_integration_tests_centos.yml
+++ b/jjb/airship/job_capi_bm_v1a2_master_integration_tests_centos.yml
@@ -79,7 +79,7 @@
     pipeline-scm:
       scm:
       - git:
-          url: https://github.com/{ci_github_repo}.git
+          url: "{ci_github_repo}"
           credentials-id: "{ci_github_jenkins_credentials_id}"
           branches:
             - '{branch|master}'

diff --git a/jjb/airship/job_capi_bm_v1a2_master_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_v1a2_master_integration_tests_ubuntu.yml
index d54e125432e57edf1546380cc80d8034b0e93518..3d1e1850c281563e6d67a8db2c1a03ea64f74c3b 100644 (file)
--- a/jjb/airship/job_capi_bm_v1a2_master_integration_tests_ubuntu.yml
+++ b/jjb/airship/job_capi_bm_v1a2_master_integration_tests_ubuntu.yml
@@ -79,7 +79,7 @@
     pipeline-scm:
       scm:
       - git:
-          url: https://github.com/{ci_github_repo}.git
+          url: "{ci_github_repo}"
           credentials-id: "{ci_github_jenkins_credentials_id}"
           branches:
             - '{branch|master}'

diff --git a/jjb/airship/job_docker_image_building.yml b/jjb/airship/job_docker_image_building.yml
index b5083eb26cfc83e99bfd2004be0b25efe93eeeca..903787fb7b4da1c5cba32d55e35a4f254b5a4e6f 100644 (file)
--- a/jjb/airship/job_docker_image_building.yml
+++ b/jjb/airship/job_docker_image_building.yml
@@ -51,7 +51,7 @@
     pipeline-scm:
       scm:
       - git:
-          url: https://github.com/{ci_github_repo}.git
+          url: "{ci_github_repo}"
           credentials-id: "{ci_github_jenkins_credentials_id}"
           branches:
             - '{branch|master}'

diff --git a/jjb/airship/job_linter_tests.yml b/jjb/airship/job_linter_tests.yml
index dd437e0e4c02f58bd3e6de4f4cade6405c7da446..8de63fd7235541805f4bd4fb70b8b0cbdb002652 100644 (file)
--- a/jjb/airship/job_linter_tests.yml
+++ b/jjb/airship/job_linter_tests.yml
@@ -79,7 +79,7 @@
     pipeline-scm:
       scm:
       - git:
-          url: https://github.com/{ci_github_repo}.git
+          url: "{ci_github_repo}"
           credentials-id: "{ci_github_jenkins_credentials_id}"
           branches:
             - '{branch|master}'

diff --git a/jjb/airship/job_openstack_image_building.yml b/jjb/airship/job_openstack_image_building.yml
index bc66f9980f3672627c803d556c48ee11944ac581..6261f518e714d87f347c7ba08094e2ef434f5605 100644 (file)
--- a/jjb/airship/job_openstack_image_building.yml
+++ b/jjb/airship/job_openstack_image_building.yml
@@ -46,7 +46,7 @@
     pipeline-scm:
       scm:
       - git:
-          url: https://github.com/{ci_github_repo}.git
+          url: "{ci_github_repo}"
           credentials-id: "{ci_github_jenkins_credentials_id}"
           branches:
             - 'master'

diff --git a/jjb/airship/job_update_nordix_repos.yml b/jjb/airship/job_update_nordix_repos.yml
index 9a47ed1e51378b771af0f6d365679e73b0cf4623..63757b9f169ab9c9aac7e56c7877fa745bca74b1 100644 (file)
--- a/jjb/airship/job_update_nordix_repos.yml
+++ b/jjb/airship/job_update_nordix_repos.yml
@@ -46,7 +46,7 @@
     pipeline-scm:
       scm:
       - git:
-          url: https://github.com/{ci_github_repo}.git
+          url: "{ci_github_repo}"
           credentials-id: "{ci_github_jenkins_credentials_id}"
           branches:
             - 'master'

diff --git a/jjb/airship/projects.yml b/jjb/airship/projects.yml
index 55ebb82eefc8bbd960d47e53d330ff48b6390bcd..256c74c1ef78104845420c9e4b4e3a51d6758408 100644 (file)
--- a/jjb/airship/projects.yml
+++ b/jjb/airship/projects.yml
@@ -45,11 +45,15 @@
     jobs:
     - capi_bm_integration_tests_ubuntu
     - capi_bm_integration_tests_centos
+    - capi_bm_v1a2_integration_tests_ubuntu
+    - capi_bm_v1a2_integration_tests_centos
     repo:
       org: "metal3-io"
       name: "project-infra"
-    ci_github_repo: 'metal3-io/project-infra'
+    ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
     ci_github_pipeline: 'jenkins/jobs/integration_tests.pipeline'
+    ci_github_jenkins_credentials_id: 'metal3-jenkins-github-token'
+    ci_ghprb_auth_id: '66556785-bf9b-42a0-812f-ccfd3c59f85c'
 
 - project:
     name: "nordix_bmo"