summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAric Gardner <agardner@linuxfoundation.org>2015-08-20 17:00:19 +0000
committerAric Gardner <agardner@linuxfoundation.org>2015-08-20 13:08:12 -0400
commitd3b7558256a9f4afa74af3fe7ab46465443234e1 (patch)
treea6723e00eec83efb9891a79677711cc705e7f975
parent8d09b505a664462b31d11e880f7a1b55be5c81d3 (diff)
Revert "Inclusion of 2 qtip_dhrystone jobs for the Dell Lab"
This reverts commit 9c26f11c59228c0e4a430f2badd70e47ca8884b4. Change-Id: Icae02c26f85138772c298bb47fed59495185ff6c Conflicts: jjb/qtip/qtip.yml
-rw-r--r--jjb/qtip/qtip.yml132
1 files changed, 1 insertions, 131 deletions
diff --git a/jjb/qtip/qtip.yml b/jjb/qtip/qtip.yml
index 4467955b6..ab6dcc49e 100644
--- a/jjb/qtip/qtip.yml
+++ b/jjb/qtip/qtip.yml
@@ -1,17 +1,11 @@
- project:
name: qtip
- pod:
- - dell-build:
- node: 'dell-build'
- installer_type: 'foreman'
- installer_ip: '172.18.0.12'
jobs:
- 'qtip-test'
- 'qtip-daily-{stream}'
- 'qtip-merge'
- 'qtip-verify'
- - 'qtip-dhrystone-VM_vs_Baremetal'
- - 'qtip_dhrystone-Baremetal_vs_Baremetal'
+
# stream: branch with - in place of / (eg. stable-helium)
# branch: branch (eg. stable/helium)
stream:
@@ -183,127 +177,3 @@
pwd
find .
echo "merge logic goes here"
-
-- job-template:
- name: 'qtip-dhrystone-VM_vs_Baremetal'
-
- project-type: freestyle
-
- disabled: false
-
- node: dell-build
-
- logrotate:
- daysToKeep: 30
- numToKeep: 10
- artifactDaysToKeep: -1
- artifactNumToKeep: -1
-
- parameters:
- - project-parameter:
- project: '{project}'
- - string:
- name: INSTALLER_TYPE
- default: foreman
- description: "Installer name that is used for deployment."
- - stirng:
- name: INSTALLER_IP
- default: '{Installer_ip}'
- description: "Installer IP"
-
- scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: master
-
- builders:
- - 'qtip-fetch-os-cred'
- - 'qtip-dhrystone-VM_vs_BM'
-
-- job-template:
- name: 'qtip-dhrystone-Baremetal_vs_Baremetal'
-
- project-type: freestyle
-
- disabled: false
-
- node: dell-build
-
- logrotate:
- daysToKeep: 30
- numToKeep: 10
- artifactDaysToKeep: -1
- artifactNumToKeep: -1
-
- parameters:
- - project-parameter:
- project: '{project}'
- - string:
- name: INSTALLER_TYPE
- default: foreman
- description: "Installer name that is used for deployment."
- - string:
- name: INSTALLER_IP
- default: '172.18.0.12'
- description: "IP address of the installer"
-
- scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: master
-
- builders:
- - 'qtip-fetch-os-cred'
- - 'qtip-dhrystone-BM_vs_BM'
-
-
-###########################
-#biuilder macros
-###########################
-- builder:
- name: qtip-dhrystone-VM_vs_BM
-
- builders:
- - shell: |
- #! /bin/bash
-
-
- if [[ ! -f $HOME/opnfv-openrc.sh]]; then
- echo "Unable to access file $HOME/opnfv-openrc.sh"
- exit 1
- fi
- source $HOME/opnfv-openrc.sh
- cd $WORKSPACE
-
-
- echo "Running QTIP dhrystone with First Test case"
- ./QTIP.sh First dhrystone
-
-
-- builder:
- name: qtip-dhrystone-BM_vs_BM
-
- builders:
- - shell: |
- #!/bin/bash
-
-
- if [[ ! -f $HOME/opnfv-openrc.sh]]; then
- echo "Unable to access file $HOME/opnfv-openrc.sh"
- exit 1
- fi
- source $HOME/opnfv-openrc.sh
- cd $WORKSPACE
-
-
- echo "Running QTIP dhrystone with Second Test case"
- ./QTIP.sh Second dhrystone
-
-
-- builder:
- name: qtip-fetch-os-cred
- builders:
- - shell: |
- !include-raw ../../utils/fetch_os_creds.sh