diff options
Diffstat (limited to 'jjb/global')
| -rw-r--r-- | jjb/global/installer-params.yml | 8 | ||||
| -rw-r--r-- | jjb/global/releng-macros.yml | 1 | ||||
| -rw-r--r-- | jjb/global/slave-params.yml | 14 |
3 files changed, 14 insertions, 9 deletions
diff --git a/jjb/global/installer-params.yml b/jjb/global/installer-params.yml index 8e957ebd9..6e965a9cb 100644 --- a/jjb/global/installer-params.yml +++ b/jjb/global/installer-params.yml @@ -10,10 +10,6 @@ default: apex description: 'Installer used for deploying OPNFV on this POD' - string: - name: DEPLOY_SCENARIO - default: 'none' - description: 'Scenario to deploy and test' - - string: name: EXTERNAL_NETWORK default: 'external' description: 'external network for test' @@ -116,10 +112,6 @@ default: netvirt description: 'Installer used for deploying OPNFV on this POD' - string: - name: DEPLOY_SCENARIO - default: 'os-odl_l2-bgpvpn-noha' - description: 'Scenario to deploy and test' - - string: name: EXTERNAL_NETWORK default: 'external' description: 'external network for test' diff --git a/jjb/global/releng-macros.yml b/jjb/global/releng-macros.yml index 89909b009..60fa22d63 100644 --- a/jjb/global/releng-macros.yml +++ b/jjb/global/releng-macros.yml @@ -132,7 +132,6 @@ failed: true unstable: true notbuilt: true - silent-start: true - wrapper: name: ssh-agent-wrapper diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml index 57bb8bda3..c87fc289c 100644 --- a/jjb/global/slave-params.yml +++ b/jjb/global/slave-params.yml @@ -378,6 +378,20 @@ default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - parameter: + name: 'intel-pod10-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - intel-pod10 + default-slaves: + - intel-pod10 + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' +- parameter: name: 'intel-pod3-defaults' parameters: - node: |