Fix github project url for properties

Jobs will not trigger off of GHPRB without it.

Issue: RELENG-1103
Change-Id: Id35c7e4f4beb5ecc06a69ac2c684cd585b565fae
Signed-off-by: Jeremy Phelps <jphelps@linuxfoundation.org>

diff --git a/jjb/lf-c-cpp-jobs.yaml b/jjb/lf-c-cpp-jobs.yaml
index a5da02b..3164b2b 100644 (file)
--- a/jjb/lf-c-cpp-jobs.yaml
+++ b/jjb/lf-c-cpp-jobs.yaml
@@ -16,6 +16,7 @@
     build-timeout: 15
     cmake-opts: ''
     git-url: '$GIT_URL/$PROJECT'
+    github-url: 'https://github.com'
     install-prefix: '$BUILD_DIR/output'
     make-opts: ''
     pre-build: ''
@@ -111,7 +112,7 @@
       - lf-infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 2330d28..13723b8 100644 (file)
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -75,6 +75,7 @@
     branch: master
     build-timeout: 90
     cron: '@monthly'
+    github-url: 'https://github.com'
     stream: master
     submodule-recursive: true
     packer-cloud-settings: packer-cloud-env
@@ -134,6 +135,7 @@
 
     branch: master
     build-timeout: 10
+    github-url: 'https://github.com'
     jjb-version: 2.0.5
     stream: master
     submodule-recursive: true
@@ -292,6 +294,7 @@
     branch: master
     cron: '@daily'
     git-url: '$GIT_URL/$GERRIT_PROJECT'
+    github-url: 'https://github.com'
     jenkins-silos: production sandbox
 
     gerrit_merge_triggers:
@@ -380,7 +383,7 @@
           project: '{project}'
           build-days-to-keep: 1
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:
@@ -423,6 +426,7 @@
     # jjb-deploy should always clone $PROJECT regardless of what
     # $GERRIT_PROJECT triggered the job.
     git-url: '$GIT_URL/$PROJECT'
+    github-url: 'https://github.com'
     stream: master
     gerrit_jjb_deploy_job_triggers:
       - comment-added-contains-event:
@@ -502,7 +506,7 @@
           project: '{project}'
           build-days-to-keep: 1
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:
@@ -594,7 +598,7 @@
           project: '{project}'
           build-days-to-keep: 7
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:
@@ -711,7 +715,7 @@
           project: '{project}'
           build-days-to-keep: 7
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:
@@ -752,6 +756,7 @@
         *.py
         *.sh
     git-url: '$GIT_URL/$PROJECT'
+    github-url: 'https://github.com'
     lhc-version: 0.2.0
     license-exclude-paths: ''
     licenses-allowed: Apache-2.0,EPL-1.0,MIT
@@ -839,7 +844,7 @@
       - lf-infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:
@@ -929,9 +934,10 @@
     # yamllint disable-line rule:key-duplicates
     <<: *lf_info_yaml_verify
 
+    github-url: 'https://github.com'
     properties:
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:
@@ -1044,7 +1050,7 @@
           project: '{project}'
           build-days-to-keep: 7
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:
@@ -1176,7 +1182,7 @@
           project: '{project}'
           build-days-to-keep: 7
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:

diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index 6112f91..0a4cc16 100644 (file)
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -162,6 +162,7 @@
     build-days-to-keep: 30  # 30 days for troubleshooting purposes
     build-timeout: 60
     git-url: '$GIT_URL/$PROJECT'
+    github-url: 'https://github.com'
     java-version: openjdk8
     mvn-global-settings: global-settings
     mvn-opts: ''
@@ -271,7 +272,7 @@
       - lf-infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:
@@ -311,6 +312,7 @@
     build-days-to-keep: 30  # 30 days in case a release takes long to get approved.
     build-timeout: 60
     git-url: '$GIT_URL/$PROJECT'
+    github-url: 'https://github.com'
     java-version: openjdk8
     mvn-global-settings: global-settings
     mvn-opts: ''
@@ -388,7 +390,7 @@
       - lf-infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:
@@ -429,6 +431,7 @@
     build-days-to-keep: 30  # 30 days in case a release takes long to get approved.
     build-timeout: 60
     git-url: '$GIT_URL/$PROJECT'
+    github-url: 'https://github.com'
     java-version: openjdk8
     mvn-global-settings: global-settings
     mvn-opts: ''
@@ -504,7 +507,7 @@
       - lf-infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:
@@ -539,6 +542,7 @@
     build-timeout: 60
     cron: 'H H * * 0'  # push fresh snapshot weekly
     git-url: '$GIT_URL/$PROJECT'
+    github-url: 'https://github.com'
     java-version: openjdk8
     mvn-global-settings: global-settings
     mvn-goals: clean deploy
@@ -638,7 +642,7 @@
       - lf-infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:
@@ -681,6 +685,7 @@
     build-timeout: 60
     cron: ''
     git-url: '$GIT_URL/$PROJECT'
+    github-url: 'https://github.com'
     java-version: openjdk8
     mvn-global-settings: global-settings
     mvn-goals: clean deploy
@@ -756,7 +761,7 @@
       - lf-infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:
@@ -792,6 +797,7 @@
     build-timeout: 60
     cron: 'H H * * 6'  # run weekly
     git-url: '$GIT_URL/$PROJECT'
+    github-url: 'https://github.com'
     java-version: openjdk8
     mvn-global-settings: global-settings
     mvn-opts: ''
@@ -908,7 +914,7 @@
       - lf-infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:
@@ -942,6 +948,7 @@
     build-days-to-keep: 7
     build-timeout: 60
     git-url: '$GIT_URL/$PROJECT'
+    github-url: 'https://github.com'
     java-version: openjdk8
     mvn-global-settings: global-settings
     mvn-goals: clean deploy
@@ -1034,7 +1041,7 @@
       - lf-infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:
@@ -1069,6 +1076,7 @@
     build-days-to-keep: 7
     build-timeout: 60
     git-url: '$GIT_URL/$PROJECT'
+    github-url: 'https://github.com'
     java-version: openjdk8
     mvn-global-settings: global-settings
     mvn-goals: clean deploy

diff --git a/jjb/lf-node-jobs.yaml b/jjb/lf-node-jobs.yaml
index 44be442..cca9388 100644 (file)
--- a/jjb/lf-node-jobs.yaml
+++ b/jjb/lf-node-jobs.yaml
@@ -34,6 +34,7 @@
     build-days-to-keep: 7
     build-timeout: 10
     git-url: '$GIT_URL/$GERRIT_PROJECT'
+    github-url: 'https://github.com'
     node-dir: ''
     stream: master
     submodule-recursive: true
@@ -133,7 +134,7 @@
       - lf-infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:

diff --git a/jjb/lf-python-jobs.yaml b/jjb/lf-python-jobs.yaml
index a32a487..9b077e4 100644 (file)
--- a/jjb/lf-python-jobs.yaml
+++ b/jjb/lf-python-jobs.yaml
@@ -93,6 +93,7 @@
     build-days-to-keep: 30  # 30 days for troubleshooting purposes
     build-timeout: 60
     git-url: '$GIT_URL/$PROJECT'
+    github-url: 'https://github.com'
     java-version: openjdk8
     nexus-iq-cli-version: 1.44.0-01
     staging-profile-id: ''  # Unused in this job
@@ -192,7 +193,7 @@
       - lf-infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:
@@ -230,6 +231,7 @@
     build-timeout: 60
     cron: 'H H * * *'  # run daily
     git-url: '$GIT_URL/$PROJECT'
+    github-url: 'https://github.com'
     java-version: openjdk8
     python-version: python2
     mvn-global-settings: global-settings
@@ -369,7 +371,7 @@
       - lf-infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:
@@ -404,6 +406,7 @@
     build-days-to-keep: 7
     build-timeout: 15
     git-url: '$GIT_URL/$GERRIT_PROJECT'
+    github-url: 'https://github.com'
     parallel: true
     python-version: python2
     stream: master
@@ -517,7 +520,7 @@
       - lf-infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:

diff --git a/jjb/lf-rtd-jobs.yaml b/jjb/lf-rtd-jobs.yaml
index eb2382a..cb044d9 100644 (file)
--- a/jjb/lf-rtd-jobs.yaml
+++ b/jjb/lf-rtd-jobs.yaml
@@ -83,6 +83,7 @@
     build-days-to-keep: 7
     build-timeout: 15
     git-url: https://github.com
+    github-url: 'https://github.com'
     project-pattern: '**'
     stream: master
     submodule-recursive: true
@@ -131,7 +132,7 @@
       - lf-infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     triggers:
       - timed: 'H H * * *'
@@ -166,6 +167,7 @@
     build-timeout: 15
     doc-dir: docs/_build/html
     git-url: '$GIT_URL/$PROJECT'
+    github-url: 'https://github.com'
     project-pattern: '**'
     stream: master
     submodule-recursive: true
@@ -228,7 +230,7 @@
       - lf-infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm: