Update global variables after backend change

Change-Id: I696da7bf3312c714425b8e54de7089c8851d7c5e
Signed-off-by: Jan-Simon Möller <dl9pf@gmx.de>

diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml
index 155ae00..97a407d 100644 (file)
--- a/jjb/global-defaults.yaml
+++ b/jjb/global-defaults.yaml
@@ -10,5 +10,5 @@
     build-artifact-num-to-keep: 5
     # Timeout in minutes
     build-timeout: 360
-    build-node: ubuntu-16.04-basebuild-2c-1g
-    ssh-credentials: 'jenkins-gerrit-credentials'
+    #build-node: ubuntu-16.04-basebuild-2c-1g
+    ssh-credentials: 'agl-jobbuilder'

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index e967dc3..691ffa4 100644 (file)
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -29,7 +29,7 @@
     name: git-scm
     scm:
       - git:
-          credentials-id: 'jenkins-gerrit-credentials'
+          credentials-id: 'd28b1f3b-3603-49bc-b837-bb0a2e85d4b8'
           url: '$GIT_BASE'
           refspec: ''
           branches:
@@ -41,7 +41,7 @@
     name: gerrit-trigger-scm
     scm:
       - git:
-          credentials-id: 'jenkins-gerrit-credentials'
+          credentials-id: 'd28b1f3b-3603-49bc-b837-bb0a2e85d4b8'
           url: '$GIT_BASE'
           refspec: '{refspec}'
           branches:
@@ -53,7 +53,7 @@
     name: gerrit-trigger-scm-basedir
     scm:
       - git:
-          credentials-id: 'jenkins-gerrit-credentials'
+          credentials-id: 'd28b1f3b-3603-49bc-b837-bb0a2e85d4b8'
           url: '$GIT_BASE'
           refspec: '{refspec}'
           branches:
@@ -66,7 +66,7 @@
     name: git-branch-scm
     scm:
       - git:
-          credentials-id: 'jenkins-gerrit-credentials'
+          credentials-id: 'd28b1f3b-3603-49bc-b837-bb0a2e85d4b8'
           url: '$GIT_BASE'
           refspec: ''
           branches:
@@ -241,4 +241,4 @@
           fail: true
       - ssh-agent-credentials:
           users:
-            - 'jenkins-gerrit-credentials'
+            - 'd28b1f3b-3603-49bc-b837-bb0a2e85d4b8'