Merge "Add missing libjpeg-dev library required by Dovetail Web Portal"

diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml
index 23a1daf..85e9b18 100644 (file)
--- a/jjb/apex/apex.yaml
+++ b/jjb/apex/apex.yaml
@@ -38,7 +38,7 @@
           baremetal-slave: 'apex-baremetal-master'
           verify-scenario: 'os-nosdn-nofeature-ha'
           scenario_stream: 'gambia'
-          disable_daily: false
+          disable_daily: true
           disable_promote: false
       - fraser: &fraser
           branch: 'stable/fraser'
@@ -48,7 +48,7 @@
           baremetal-slave: 'apex-baremetal-master'
           verify-scenario: 'os-nosdn-nofeature-ha'
           scenario_stream: 'fraser'
-          disable_daily: false
+          disable_daily: true
           disable_promote: true
       - euphrates: &euphrates
           branch: 'stable/euphrates'

diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2
index 451274c..aaa166e 100644 (file)
--- a/jjb/apex/apex.yaml.j2
+++ b/jjb/apex/apex.yaml.j2
@@ -38,7 +38,7 @@
           baremetal-slave: 'apex-baremetal-master'
           verify-scenario: 'os-nosdn-nofeature-ha'
           scenario_stream: 'gambia'
-          disable_daily: false
+          disable_daily: true
           disable_promote: false
       - fraser: &fraser
           branch: 'stable/fraser'
@@ -48,7 +48,7 @@
           baremetal-slave: 'apex-baremetal-master'
           verify-scenario: 'os-nosdn-nofeature-ha'
           scenario_stream: 'fraser'
-          disable_daily: false
+          disable_daily: true
           disable_promote: true
       - euphrates: &euphrates
           branch: 'stable/euphrates'

diff --git a/jjb/global/releng-macros.yaml b/jjb/global/releng-macros.yaml
index 2f156cd..8825677 100644 (file)
--- a/jjb/global/releng-macros.yaml
+++ b/jjb/global/releng-macros.yaml
@@ -101,7 +101,7 @@
     name: git-scm
     scm:
       - git: &git-scm-defaults
-          credentials-id: '$SSH_CREDENTIAL_ID'
+          credentials-id: 'd42411ac011ad6f3dd2e1fa34eaa5d87f910eb2e'
           url: '$GIT_BASE'
           branches:
             - 'origin/$BRANCH'
@@ -136,7 +136,7 @@
     name: git-scm-with-submodules
     scm:
       - git:
-          credentials-id: '$SSH_CREDENTIAL_ID'
+          credentials-id: 'd42411ac011ad6f3dd2e1fa34eaa5d87f910eb2e'
           url: '$GIT_BASE'
           refspec: ''
           branches: