diff options
| -rwxr-xr-x | jjb/compass4nfv/compass4nfv.yml | 12 | ||||
| -rw-r--r-- | jjb/copper/docu-build.sh | 12 | ||||
| -rw-r--r-- | jjb/qtip/qtip.yml | 132 |
3 files changed, 144 insertions, 12 deletions
diff --git a/jjb/compass4nfv/compass4nfv.yml b/jjb/compass4nfv/compass4nfv.yml index 9c9487169..af1b43ccf 100755 --- a/jjb/compass4nfv/compass4nfv.yml +++ b/jjb/compass4nfv/compass4nfv.yml @@ -22,10 +22,10 @@ flavor: - five: conf: 'five' - node: 'compass-build-deploy-02' + node: 'huawei-build' - cluster: conf: 'cluster' - node: 'compass-build-deploy-03' + node: 'huawei-build' @@ -68,7 +68,7 @@ disabled: false - node: compass-build-deploy-03 + node: huawei-build logrotate: daysToKeep: 30 @@ -126,7 +126,7 @@ project-type: freestyle - node: compass-build-deploy-03 + node: huawei-build logrotate: daysToKeep: 30 @@ -171,7 +171,7 @@ project-type: freestyle - node: compass-build-deploy-03 + node: huawei-build parameters: - project-parameter: @@ -215,7 +215,7 @@ project-type: freestyle - node: compass-build-deploy-03 + node: huawei-build logrotate: daysToKeep: 30 diff --git a/jjb/copper/docu-build.sh b/jjb/copper/docu-build.sh index 626814d82..8508ba8d4 100644 --- a/jjb/copper/docu-build.sh +++ b/jjb/copper/docu-build.sh @@ -34,11 +34,13 @@ if [[ $JOB_NAME =~ "verify" ]] ; then echo echo "Document is available at http://$gs_path_review/index.html" else - gsutil cp -r build/design_docs "gs://$gs_path_branch/" - gsutil cp -r build/requirements/html "gs://$gs_path_branch/" - gsutil cp -r build/requirements/latex/*.pdf "gs://$gs_path_branch/" - echo - echo "Latest document is available at http://$gs_path_branch/index.html" + gsutil cp -r build/* "gs://$gs_path_branch/design_docs/" + #gsutil cp -r build/design_docs "gs://$gs_path_branch/" + #gsutil cp -r build/requirements/html "gs://$gs_path_branch/" + #gsutil cp -r build/requirements/latex/*.pdf "gs://$gs_path_branch/" + #echo + + echo "Latest document is available at http://$gs_path_branch/design_docs/index.html" if gsutil ls "gs://$gs_path_review" > /dev/null 2>&1 ; then echo diff --git a/jjb/qtip/qtip.yml b/jjb/qtip/qtip.yml index ab6dcc49e..bd07facae 100644 --- a/jjb/qtip/qtip.yml +++ b/jjb/qtip/qtip.yml @@ -1,11 +1,17 @@ - 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: @@ -177,3 +183,127 @@ pwd find . echo "merge logic goes here" + + - job-template: + name: 'qtip-dhrystone-VM_vs_Baremetal' + + project-type: freestyle + + disabled: false + + node: '{node}' + + logrotate: + daysToKeep: 30 + numToKeep: 10 + artifactDaysToKeep: -1 + artifactNumToKeep: -1 + + parameters: + - project-parameter: + project: '{project}' + - string: + name: INSTALLER_TYPE + default: '{installer_type}' + 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: '{node}' + + logrotate: + daysToKeep: 30 + numToKeep: 10 + artifactDaysToKeep: -1 + artifactNumToKeep: -1 + + parameters: + - project-parameter: + project: '{project}' + - string: + name: INSTALLER_TYPE + default: '{installer_type}' + description: "Installer name that is used for deployment." + - string: + name: INSTALLER_IP + default: '{installer_ip}' + 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 |