X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fqtip%2Fqtip.yml;h=fac9c333cbb10fcc63122ee4b91b21b98f5d6045;hb=d89e4fb6c5df49b988df06aef33b33b67b42f942;hp=d777221c64eb2c2d5ed58bb8bbfa7400efdabecf;hpb=2ff1e5c92513a1f74ffa122fe3a51d0e02579e78;p=releng.git diff --git a/jjb/qtip/qtip.yml b/jjb/qtip/qtip.yml index d777221c6..fac9c333c 100644 --- a/jjb/qtip/qtip.yml +++ b/jjb/qtip/qtip.yml @@ -1,121 +1,44 @@ - project: name: qtip - jobs: - - 'qtip-test' - - 'qtip-daily-{stream}' - - 'qtip-merge' - - 'qtip-verify' - - 'qtip-dhrystone-VM_vs_Baremetal-{pod}' - - 'qtip_dhrystone-BM_vs_BM-{pod}' - - # stream: branch with - in place of / (eg. stable-helium) - # branch: branch (eg. stable/helium) + project: '{name}' + jobs: + - 'qtip-verify-{stream}' + - 'qtip-dhrystone-serial-{pod}' + - 'qtip-ssl-parallel-{pod}' pod: - dell-build: - node: 'dell-build' - installer_type: 'foreman' - installer_ip: '172.18.0.12' - + node: 'dell-us-testing-bm-1' + installer_type: 'fuel' + installer_ip: '10.20.0.2' +# only master branch is enabled at the moment to keep no of jobs sane stream: - master: branch: 'master' - - project: 'qtip' - somevar: 'foo' + gs-pathname: '' +# - brahmaputra: +# branch: 'stable/brahmaputra' +# gs-pathname: '/brahmaputra' - job-template: - name: qtip-test - - project-type: freestyle - - logrotate: - daysToKeep: 30 - numToKeep: 10 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - - builders: - - shell: | - echo "Hello world from qtip" - -- job-template: - name: 'qtip-daily-{stream}' - - # Job template for daily builders - # - # Required Variables: - # stream: branch with - in place of / (eg. stable) - # branch: branch (eg. stable) - - project-type: freestyle - varsetabove: '{somevar}' - - logrotate: - daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' + name: 'qtip-verify-{stream}' parameters: - project-parameter: project: '{project}' - - - scm: - - git-scm: - credentials-id: '{ssh-credentials}' - refspec: '' + - gerrit-parameter: branch: '{branch}' + - 'opnfv-build-defaults' - wrappers: - - ssh-agent-credentials: - user: '{ssh-credentials}' - - triggers: - - timed: 'H H * * *' - - prebuilders: - - test-macro - - builders: - - shell: | - pwd - find . - echo "Hello world from qtip {somevar} daily" - - postbuilders: - - test-macro - -- job-template: - name: 'qtip-verify' - - project-type: freestyle - - logrotate: - daysToKeep: 30 - numToKeep: 10 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - - parameters: - - project-parameter: - project: '{project}' - - gerrit-parameter: - branch: 'master' scm: - gerrit-trigger-scm: credentials-id: '{ssh-credentials}' refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' - wrappers: - - ssh-agent-credentials: - user: '{ssh-credentials}' - triggers: - gerrit: trigger-on: @@ -130,82 +53,25 @@ comment-contains-value: 'reverify' projects: - project-compare-type: 'ANT' - project-pattern: 'qtip' + project-pattern: '{project}' branches: - branch-compare-type: 'ANT' - branch-pattern: '**/master' + branch-pattern: '**/{branch}' + forbidden-file-paths: + - compare-type: ANT + pattern: 'docs/**|.gitignore' builders: - shell: | - pwd - find . - echo "verify logic goes here" + echo "Nothing to verify!" - job-template: - name: 'qtip-merge' - - # builder-merge job to run JJB update - # - # This job's purpose is to update all the JJB - - project-type: freestyle - - logrotate: - daysToKeep: 30 - numToKeep: 40 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - - parameters: - - project-parameter: - project: '{project}' - - gerrit-parameter: - branch: 'master' - - scm: - - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' - refspec: '' - choosing-strategy: 'default' - - wrappers: - - ssh-agent-credentials: - user: '{ssh-credentials}' - - triggers: - - gerrit: - trigger-on: - - change-merged-event - - comment-added-contains-event: - comment-contains-value: 'remerge' - projects: - - project-compare-type: 'ANT' - project-pattern: 'qtip' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/master' - - builders: - - shell: | - pwd - find . - echo "merge logic goes here" - -- job-template: - name: 'qtip-dhrystone-VM_vs_Baremetal-{pod}' - - project-type: freestyle + name: 'qtip-dhrystone-serial-{pod}' disabled: false node: '{node}' - logrotate: - daysToKeep: 30 - numToKeep: 10 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - parameters: - project-parameter: project: '{project}' @@ -230,27 +96,18 @@ builders: - 'qtip-fetch-os-cred' - - 'qtip-dhrystone-VM_vs_BM' + - 'qtip-dhrystone-serial' triggers: - - timed: '0 13 * * *' + - timed: '0 20 * * *' - job-template: - name: 'qtip_dhrystone-BM_vs_BM-{pod}' - - - project-type: freestyle + name: 'qtip-ssl-parallel-{pod}' disabled: false node: '{node}' - logrotate: - daysToKeep: 30 - numToKeep: 10 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - parameters: - project-parameter: project: '{project}' @@ -275,56 +132,52 @@ builders: - 'qtip-fetch-os-cred' - - 'qtip-dhrystone-BM_vs_BM' + - 'qtip-ssl-parallel' triggers: - - timed: "@midnight" + - timed: '0 0,11,18 * * *' ########################### #biuilder macros ########################### - builder: - name: qtip-dhrystone-VM_vs_BM + name: qtip-dhrystone-serial builders: - shell: | #! /bin/bash - - - if [[ ! -f $HOME/opnfv-openrc.sh]]; then - echo "Unable to access file $HOME/opnfv-openrc.sh" + if [[ ! -f $WORKSPACE/opnfv-stack.sh ]]; then + echo "Unable to access file $WO:qRKSPACE/opnfv-openrc.sh" exit 1 fi - source $HOME/opnfv-openrc.sh + source $WORKSPACE/opnfv-stack.sh cd $WORKSPACE - - echo "Running QTIP dhrystone with First Test case" - ./QTIP.sh First dhrystone - + python qtip.py -s compute -b dhrystone_serial.yaml - builder: - name: qtip-dhrystone-BM_vs_BM + name: qtip-ssl-parallel builders: - shell: | #!/bin/bash - - - if [[ ! -f $HOME/opnfv-openrc.sh]]; then - echo "Unable to access file $HOME/opnfv-openrc.sh" + if [[ ! -f $WORKSPACE/opnfv-stack.sh ]]; then + echo "Unable to access file $WORKSPACE/opnfv-openrc.sh" exit 1 fi - source $HOME/opnfv-openrc.sh + source $WORKSPACE/opnfv-stack.sh cd $WORKSPACE - - echo "Running QTIP dhrystone with Second Test case" - ./QTIP.sh Second dhrystone - + python qtip.py -s compute -b ssl_parallel.yaml - builder: name: qtip-fetch-os-cred builders: - shell: | - !include-raw ../../utils/fetch_os_creds.sh + echo $HOME + echo $WORKSPACE + cd $WORKSPACE + git clone https://gerrit.opnfv.org/gerrit/releng + cd $WORKSPACE/releng/utils + #./fetch_os_creds.sh #To test the problem with creating the file in $HOME + ./fetch_os_creds.sh -d $WORKSPACE/opnfv-stack.sh #To test if the file can be created in $WORKSPACE