diff options
| -rw-r--r-- | jjb/apex/apex.yml | 239 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yml | 14 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-deploy-bare.sh | 4 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-deploy-virtual.sh | 2 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-project-jobs.yml | 31 | ||||
| -rw-r--r-- | jjb/fuel/fuel-ci-jobs.yml | 49 | ||||
| -rwxr-xr-x | jjb/fuel/fuel-deploy-virtual.sh | 56 | ||||
| -rwxr-xr-x | jjb/fuel/fuel-deploy.sh | 30 | ||||
| -rw-r--r-- | jjb/fuel/fuel-project-jobs.yml | 32 | ||||
| -rw-r--r-- | jjb/functest/functest-ci-jobs.yml | 14 | ||||
| -rw-r--r-- | jjb/joid/joid-ci-jobs.yml | 12 | ||||
| -rw-r--r-- | jjb/opnfv/installer-params.yml | 12 | ||||
| -rw-r--r-- | jjb/opnfv/opnfv-docker.sh | 17 | ||||
| -rw-r--r-- | jjb/opnfv/opnfv-docs.yml | 4 | ||||
| -rw-r--r-- | jjb/opnfv/slave-params.yml | 8 | ||||
| -rw-r--r-- | jjb/qtip/qtip.yml | 28 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-ci-jobs.yml | 20 | ||||
| -rwxr-xr-x | utils/docs-build.sh | 6 |
18 files changed, 358 insertions, 220 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 57825cecd..a1b922c5d 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -2,10 +2,10 @@ name: apex jobs: - 'apex-verify-{stream}' - - 'apex-merge-{stream}' + - 'apex-runner-{platform}-{scenario}-{stream}' - 'apex-build-{stream}' - - 'apex-deploy-virtual-{stream}' - - 'apex-deploy-baremetal-{stream}' + - 'apex-deploy-virtual-{scenario}-{stream}' + - 'apex-deploy-baremetal-{scenario}-{stream}' - 'apex-daily-{stream}' # stream: branch with - in place of / (eg. stable-arno) @@ -17,9 +17,21 @@ - brahmaputra: branch: 'stable/brahmaputra' gs-pathname: '/brahmaputra' + disabled: true project: 'apex' + scenario: + - 'os-odl_l2-nofeature-ha' + - 'os-odl_l2-sfc-ha' + - 'os-odl_l3-nofeature-ha' + - 'os-onos-nofeature-ha' + - 'os-opencontrail-nofeature-ha' + + platform: + - 'baremetal' + - 'virtual' + - job-template: name: 'apex-verify-{stream}' @@ -28,7 +40,6 @@ parameters: - apex-parameter: gs-pathname: '{gs-pathname}' - ARTIFACT_VERSION: 'dev' - project-parameter: project: '{project}' - gerrit-parameter: @@ -82,22 +93,32 @@ - "apex-daily.*" - "apex-deploy.*" - "apex-build.*" + - "apex-runner.*" builders: - 'apex-build' - - 'apex-deploy-virtual' + - trigger-builds: + - project: 'apex-deploy-virtual-os-odl_l2-nofeature-ha-{stream}' + predefined-parameters: + BUILD_DIRECTORY=apex-verify-master/build_output + git-revision: false + block: true + - trigger-builds: + - project: 'apex-deploy-virtual-os-onos-nofeature-ha-{stream}' + predefined-parameters: + BUILD_DIRECTORY=apex-verify-master/build_output + git-revision: false + block: true - 'apex-workspace-cleanup' - job-template: - name: 'apex-merge-{stream}' + name: 'apex-runner-{platform}-{scenario}-{stream}' - # builder-merge job to run JJB update - # - # This job's purpose is to update all the JJB + # runner jobs for deploying manually node: opnfv-jump-1 - disabled: true + disabled: false parameters: - apex-parameter: @@ -117,26 +138,34 @@ refspec: '' choosing-strategy: 'default' - triggers: - - gerrit: - trigger-on: - - change-merged-event - - comment-added-contains-event: - comment-contains-value: 'remerge' - projects: - - project-compare-type: 'ANT' - project-pattern: 'apex' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/master' - forbidden-file-paths: - - compare-type: ANT - pattern: 'docs/**' + properties: + - build-blocker: + use-build-blocker: true + blocking-jobs: + - "apex-daily.*" + - "apex-verify.*" builders: - - 'apex-build' - - 'apex-deploy-virtual' - - 'apex-workspace-cleanup' + - trigger-builds: + - project: 'apex-deploy-{platform}-{scenario}-{stream}' + git-revision: false + block: true + - trigger-builds: + - project: 'functest-apex-opnfv-jump-1-daily-{stream}' + predefined-parameters: + DEPLOY_SCENARIO='{scenario}' + block: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' + - trigger-builds: + - project: 'yardstick-apex-opnfv-jump-1-daily-{stream}' + block: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' - job-template: name: 'apex-build-{stream}' @@ -176,12 +205,16 @@ builders: - 'apex-build' - - 'apex-deploy-virtual' + - trigger-builds: + - project: 'apex-deploy-virtual-os-odl_l2-nofeature-ha-{stream}' + predefined-parameters: + BUILD_DIRECTORY=apex-build-master/build_output + git-revision: false + block: true - 'apex-upload-artifact' - - 'apex-workspace-cleanup' - job-template: - name: 'apex-deploy-virtual-{stream}' + name: 'apex-deploy-virtual-{scenario}-{stream}' # Job template for virtual deployment # @@ -203,21 +236,23 @@ project: '{project}' - apex-parameter: gs-pathname: '{gs-pathname}' + - string: + name: DEPLOY_SCENARIO + default: '{scenario}' + description: "Scenario to deploy with." properties: - build-blocker: use-build-blocker: true blocking-jobs: - - "apex-verify.*" - "apex-deploy.*" - - "apex-build.*" builders: - 'apex-deploy-virtual' - 'apex-workspace-cleanup' - job-template: - name: 'apex-deploy-baremetal-{stream}' + name: 'apex-deploy-baremetal-{scenario}-{stream}' # Job template for baremetal deployment # @@ -239,6 +274,10 @@ project: '{project}' - apex-parameter: gs-pathname: '{gs-pathname}' + - string: + name: DEPLOY_SCENARIO + default: '{scenario}' + description: "Scenario to deploy with." properties: - build-blocker: @@ -284,9 +323,10 @@ - "apex-verify.*" - "apex-deploy.*" - "apex-build.*" + - "apex-runner.*" triggers: - - 'apex-master' + - 'apex-{stream}' builders: - trigger-builds: @@ -295,11 +335,37 @@ current-parameters: true block: true - trigger-builds: - - project: 'apex-deploy-baremetal-{stream}' + - project: 'apex-deploy-baremetal-os-odl_l2-nofeature-ha-{stream}' + predefined-parameters: + BUILD_DIRECTORY=apex-build-master/build_output git-revision: true block: true - trigger-builds: - project: 'functest-apex-opnfv-jump-1-daily-{stream}' + predefined-parameters: + DEPLOY_SCENARIO=os-odl_l2-nofeature-ha + block: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' + - trigger-builds: + - project: 'yardstick-apex-opnfv-jump-1-daily-{stream}' + block: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' + - trigger-builds: + - project: 'apex-deploy-baremetal-os-onos-nofeature-ha-{stream}' + predefined-parameters: + BUILD_DIRECTORY=apex-build-master/build_output + git-revision: true + block: true + - trigger-builds: + - project: 'functest-apex-opnfv-jump-1-daily-{stream}' + predefined-parameters: + DEPLOY_SCENARIO=os-onos-nofeature-ha block: true block-thresholds: build-step-failure-threshold: 'never' @@ -425,8 +491,19 @@ # upload artifact and additional files to google storage gsutil cp $BUILD_DIRECTORY/OPNFV-CentOS-7-x86_64-$OPNFV_ARTIFACT_VERSION.iso gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso > gsutil.iso.log 2>&1 - gsutil cp $BUILD_DIRECTORY/$(basename $OPNFV_RPM_URL) gs://$GS_URL/$(basename $OPNFV_RPM_URL) > gsutil.iso.log 2>&1 - gsutil cp $BUILD_DIRECTORY/$(basename $OPNFV_SRPM_URL) gs://$GS_URL/$(basename $OPNFV_SRPM_URL) > gsutil.iso.log 2>&1 + RPM_INSTALL_PATH=$BUILD_DIRECTORY/$(basename $OPNFV_RPM_URL) + RPM_LIST=$RPM_INSTALL_PATH + for pkg in common undercloud; do + RPM_LIST+=" ${RPM_INSTALL_PATH/opnfv-apex/opnfv-apex-${pkg}}" + done + SRPM_INSTALL_PATH=$BUILD_DIRECTORY/$(basename $OPNFV_SRPM_URL) + SRPM_LIST=$SRPM_INSTALL_PATH + for pkg in common undercloud; do + SRPM_LIST+=" ${SRPM_INSTALL_PATH/opnfv-apex/opnfv-apex-${pkg}}" + done + for artifact in $RPM_LIST $SRPM_LIST; do + gsutil cp $artifact gs://$GS_URL/$(basename $artifact) > gsutil.iso.log 2>&1 + done gsutil cp $WORKSPACE/opnfv.properties gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.properties > gsutil.properties.log 2>&1 gsutil cp $WORKSPACE/opnfv.properties gs://$GS_URL/latest.properties > gsutil.latest.log 2>&1 @@ -455,12 +532,29 @@ # specific artifact from artifacts.opnfv.org RPM_INSTALL_PATH=$GS_URL/$ARTIFACT_NAME else - if [[ -f opnfv.properties ]]; then + if [[ $BUILD_DIRECTORY == *verify* ]]; then + BUILD_DIRECTORY=$WORKSPACE/../$BUILD_DIRECTORY + echo "BUILD DIRECTORY modified to $BUILD_DIRECTORY" + elif [[ $BUILD_DIRECTORY == *apex-build* ]]; then + BUILD_DIRECTORY=$WORKSPACE/../$BUILD_DIRECTORY + echo "BUILD DIRECTORY modified to $BUILD_DIRECTORY" + fi + + if [[ -f ${BUILD_DIRECTORY}/../opnfv.properties ]]; then # if opnfv.properties exists then use the # local build. Source the file so we get local OPNFV vars - source opnfv.properties - RPM_INSTALL_PATH=build_output/$(basename $OPNFV_RPM_URL) + source ${BUILD_DIRECTORY}/../opnfv.properties + RPM_INSTALL_PATH=${BUILD_DIRECTORY}/$(basename $OPNFV_RPM_URL) else + if [[ $BUILD_DIRECTORY == *verify* ]]; then + echo "BUILD_DIRECTORY is from a verify job, so will not use latest from URL" + echo "Check that the slave has opnfv.properties in $BUILD_DIRECTORY" + exit 1 + elif [[ $BUILD_DIRECTORY == *apex-build* ]]; then + echo "BUILD_DIRECTORY is from a daily job, so will not use latest from URL" + echo "Check that the slave has opnfv.properties in $BUILD_DIRECTORY" + exit 1 + fi # no opnfv.properties means use the latest from artifacts.opnfv.org # get the latest.properties to get the link to the latest artifact curl -s -o $WORKSPACE/opnfv.properties http://$GS_URL/latest.properties @@ -471,12 +565,6 @@ fi fi - source opnfv.properties - RPM_INSTALL_PATH=build_output/$(basename $OPNFV_RPM_URL) - if [ ! -e "$RPM_INSTALL_PATH" ]; then - RPM_INSTALL_PATH=http://${OPNFV_RPM_URL} - fi - RPM_LIST=$RPM_INSTALL_PATH for pkg in common undercloud; do RPM_LIST+=" ${RPM_INSTALL_PATH/opnfv-apex/opnfv-apex-${pkg}}" @@ -488,7 +576,7 @@ echo "RPM is already installed" elif sudo yum update -y $RPM_LIST | grep "does not update installed package"; then if ! sudo yum downgrade -y $RPM_LIST; then - yum remove -y opnfv-undercloud opnfv-common + sudo yum remove -y opnfv-undercloud opnfv-common sudo yum downgrade -y $RPM_INSTALL_PATH fi fi @@ -499,8 +587,19 @@ # cleanup virtual machines before we start sudo opnfv-clean # initiate virtual deployment - if [ -e /usr/share/doc/opnfv/network_settings.yaml.example ]; then - sudo opnfv-deploy -v -d /usr/share/doc/opnfv/deploy_settings.yaml.example -n /usr/share/doc/opnfv/network_settings.yaml.example + if [ -e /etc/opnfv-apex/network_settings.yaml ]; then + if [ -n "$DEPLOY_SCENARIO" ]; then + echo "Deploy Scenario set to ${DEPLOY_SCENARIO}" + if [ -e /etc/opnfv-apex/${DEPLOY_SCENARIO}.yaml ]; then + sudo opnfv-deploy -v -d /etc/opnfv-apex/${DEPLOY_SCENARIO}.yaml -n /etc/opnfv-apex/network_settings.yaml + else + echo "File does not exist /etc/opnfv-apex/${DEPLOY_SCENARIO}.yaml" + exit 1 + fi + else + echo "Deploy scenario not set!" + exit 1 + fi else sudo opnfv-deploy -v fi @@ -527,11 +626,15 @@ # specific artifact from artifacts.opnfv.org RPM_INSTALL_PATH=$GS_URL/$ARTIFACT_NAME else - if [[ -f opnfv.properties ]]; then + if [[ $BUILD_DIRECTORY == *apex-build* ]]; then + BUILD_DIRECTORY=$WORKSPACE/../$BUILD_DIRECTORY + echo "BUILD DIRECTORY modified to $BUILD_DIRECTORY" + fi + if [[ -f ${BUILD_DIRECTORY}/../opnfv.properties ]]; then # if opnfv.properties exists then use the # local build. Source the file so we get local OPNFV vars - source opnfv.properties - RPM_INSTALL_PATH=build_output/$(basename $OPNFV_RPM_URL) + source ${BUILD_DIRECTORY}/../opnfv.properties + RPM_INSTALL_PATH=${BUILD_DIRECTORY}/$(basename $OPNFV_RPM_URL) else # no opnfv.properties means use the latest from artifacts.opnfv.org # get the latest.properties to get the link to the latest artifact @@ -543,8 +646,6 @@ fi fi - source opnfv.properties - RPM_INSTALL_PATH=build_output/$(basename $OPNFV_RPM_URL) if [ ! -e "$RPM_INSTALL_PATH" ]; then RPM_INSTALL_PATH=http://${OPNFV_RPM_URL} fi @@ -560,7 +661,7 @@ echo "RPM is already installed" elif sudo yum update -y $RPM_LIST | grep "does not update installed package"; then if ! sudo yum downgrade -y $RPM_LIST; then - yum remove -y opnfv-undercloud opnfv-common + sudo yum remove -y opnfv-undercloud opnfv-common sudo yum downgrade -y $RPM_INSTALL_PATH fi fi @@ -571,9 +672,25 @@ # cleanup environment before we start sudo opnfv-clean # initiate baremetal deployment - sudo opnfv-deploy -i /root/inventory/pod_settings.yaml \ - -d /usr/share/doc/opnfv/deploy_settings.yaml.example \ - -n /root/network/network_settings.yaml + if [ -e /etc/opnfv-apex/network_settings.yaml ]; then + if [ -n "$DEPLOY_SCENARIO" ]; then + echo "Deploy Scenario set to ${DEPLOY_SCENARIO}" + if [ -e /etc/opnfv-apex/${DEPLOY_SCENARIO}.yaml ]; then + sudo opnfv-deploy -i /root/inventory/pod_settings.yaml \ + -d /etc/opnfv-apex/${DEPLOY_SCENARIO}.yaml \ + -n /root/network/network_settings.yaml + else + echo "File does not exist /etc/opnfv-apex/${DEPLOY_SCENARIO}.yaml" + exit 1 + fi + else + echo "Deploy scenario not set!" + exit 1 + fi + else + echo "File /etc/opnfv-apex/network_settings.yaml does not exist!" + exit 1 + fi echo echo "--------------------------------------------------------" @@ -586,3 +703,7 @@ name: 'apex-master' triggers: - timed: '0 3 * * *' +- trigger: + name: 'apex-brahmaputra' + triggers: + - timed: '0 6 * * 2050' diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index 535fb3b31..64a4b317c 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -42,7 +42,7 @@ auto-trigger-name: 'compass-{scenario}-{pod}-trigger' # - 'os-ocl-nofeature-ha': # disabled: true -# auto-trigger-name: 'joid-{scenario}-{pod}-trigger' +# auto-trigger-name: 'compass-{scenario}-{pod}-trigger' jobs: - 'compass-{scenario}-{pod}-daily-{stream}' @@ -82,7 +82,7 @@ gs-pathname: '{gs-pathname}' - string: name: DEPLOY_SCENARIO - default: 'none' + default: '{scenario}' - 'huawei-build-defaults' - '{installer}-defaults' @@ -132,6 +132,10 @@ blocking-jobs: - 'compass-deploy-{pod}-daily-{stream}' + wrappers: + - build-name: + name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' + parameters: - project-parameter: project: '{project}' @@ -207,15 +211,15 @@ - trigger: name: 'compass-os-nosdn-nofeature-ha-huawei-us-deploy-bare-1-trigger' triggers: - - timed: '0 16 * * * ' + - timed: '0 3 * * * ' - trigger: name: 'compass-os-odl_l2-nofeature-ha-huawei-us-deploy-bare-1-trigger' triggers: - - timed: '' + - timed: '0 20 * * *' - trigger: name: 'compass-os-onos-nofeature-ha-huawei-us-deploy-bare-1-trigger' triggers: - - timed: '' + - timed: '0 15 * * *' - trigger: name: 'compass-os-ocl-nofeature-ha-huawei-us-deploy-bare-1-trigger' triggers: diff --git a/jjb/compass4nfv/compass-deploy-bare.sh b/jjb/compass4nfv/compass-deploy-bare.sh index 12b9b337b..dc0aeb29d 100644 --- a/jjb/compass4nfv/compass-deploy-bare.sh +++ b/jjb/compass4nfv/compass-deploy-bare.sh @@ -6,7 +6,7 @@ echo "Starting the deployment on baremetal environment using $INSTALLER_TYPE. Th echo "--------------------------------------------------------" echo -export CONFDIR=$WORKSPACE/deploy/conf/hardware_environment/huawei_us_lab/pod1 +export CONFDIR=$WORKSPACE/deploy/conf/hardware_environment/$NODE_NAME export ISO_URL=file://$BUILD_DIRECTORY/compass.iso export INSTALL_NIC=eth0 @@ -14,7 +14,7 @@ cd $WORKSPACE export OS_VERSION=${{COMPASS_OS_VERSION}} export OPENSTACK_VERSION=${{COMPASS_OPENSTACK_VERSION}} -./deploy.sh --dha $CONFDIR/dha.yml --network $CONFDIR/network.yml +./deploy.sh --dha $CONFDIR/${{DEPLOY_SCENARIO}}.yml --network $CONFDIR/network.yml if [ $? -ne 0 ]; then echo "depolyment failed!" deploy_ret=1 diff --git a/jjb/compass4nfv/compass-deploy-virtual.sh b/jjb/compass4nfv/compass-deploy-virtual.sh index b35658bd7..4991350a0 100644 --- a/jjb/compass4nfv/compass-deploy-virtual.sh +++ b/jjb/compass4nfv/compass-deploy-virtual.sh @@ -10,7 +10,7 @@ export ISO_URL=file://$BUILD_DIRECTORY/compass.iso export OS_VERSION=${{COMPASS_OS_VERSION}} export OPENSTACK_VERSION=${{COMPASS_OPENSTACK_VERSION}} export CONFDIR=$WORKSPACE/deploy/conf/vm_environment -./deploy.sh --dha $CONFDIR/$SDN_CONTROLLER.yml --network $CONFDIR/$NODE_NAME/network.yml +./deploy.sh --dha $CONFDIR/$DEPLOY_SCENARIO.yml --network $CONFDIR/$NODE_NAME/network.yml if [ $? -ne 0 ]; then echo "depolyment failed!" deploy_ret=1 diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml index 345c4c3fb..565aaa33f 100644 --- a/jjb/compass4nfv/compass-project-jobs.yml +++ b/jjb/compass4nfv/compass-project-jobs.yml @@ -15,17 +15,17 @@ gs-pathname: '/{stream}' - sdn-controller: - - 'nosdn': + scenario: + - 'os-nosdn-nofeature-ha': disabled: false node: huawei-deploy-vm - - 'odl': + - 'os-odl_l2-nofeature-ha': disabled: false node: huawei-deploy-vm - - 'onos': + - 'os-onos-nofeature-ha': disabled: false node: huawei-deploy-vm -# - 'opencontrail': +# - 'os-ocl-nofeature-ha': # disabled: true # node: huawei-deploy-vm @@ -33,7 +33,7 @@ - 'compass-verify-{stream}' - 'compass-build-iso-{stream}' - 'compass-build-ppa-{stream}' - - 'compass-deploy-virtual-{sdn-controller}-{stream}' + - 'compass-deploy-virtual-{scenario}-{stream}' - 'compass-virtual-daily-{stream}' ######################## @@ -65,8 +65,8 @@ - '{node}-defaults' - '{installer}-defaults' - string: - name: SDN_CONTROLLER - default: 'nosdn' + name: DEPLOY_SCENARIO + default: 'os-nosdn-nofeature-ha' scm: - gerrit-trigger-scm: @@ -137,7 +137,7 @@ branch: '{branch}' triggers: - - timed: 'H 16 * * *' + - timed: 'H 14 * * *' builders: - trigger-builds: @@ -145,15 +145,15 @@ git-revision: true block: true - trigger-builds: - - project: 'compass-deploy-virtual-nosdn-{stream}' + - project: 'compass-deploy-virtual-os-nosdn-nofeature-ha-{stream}' git-revision: true block: false - trigger-builds: - - project: 'compass-deploy-virtual-odl-{stream}' + - project: 'compass-deploy-virtual-os-odl_l2-nofeature-ha-{stream}' git-revision: true block: false - trigger-builds: - - project: 'compass-deploy-virtual-onos-{stream}' + - project: 'compass-deploy-virtual-os-onos-nofeature-ha-{stream}' git-revision: true block: false @@ -227,7 +227,7 @@ !include-raw: ./compass-makeppa.sh - job-template: - name: 'compass-deploy-virtual-{sdn-controller}-{stream}' + name: 'compass-deploy-virtual-{scenario}-{stream}' disabled: false @@ -248,11 +248,8 @@ installer: '{installer}' gs-pathname: '{gs-pathname}' - string: - name: SDN_CONTROLLER - default: '{sdn-controller}' - - string: name: DEPLOY_SCENARIO - default: 'none' + default: '{scenario}' - '{node}-defaults' - '{installer}-defaults' diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml index 9caf3d183..50e45a41e 100644 --- a/jjb/fuel/fuel-ci-jobs.yml +++ b/jjb/fuel/fuel-ci-jobs.yml @@ -26,6 +26,8 @@ pod: - opnfv-jump-2: <<: *brahmaputra + - ericsson-pod1: + <<: *brahmaputra - virtual: <<: *brahmaputra #-------------------------------- @@ -41,21 +43,39 @@ # new scenario descriptions scenario: - - 'os-nosdn-kvm-ha': + # HA scenarios + - 'os-odl_l2-nofeature-ha': + auto-trigger-name: 'fuel-{scenario}-{pod}-trigger' + - 'os-odl_l3-nofeature-ha': auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - - 'os-nosdn-kvm_ovs-ha': + - 'os-onos-nofeature-ha': auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - 'os-nosdn-nofeature-ha': auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + - 'os-nosdn-kvm-ha': + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + - 'os-nosdn-kvm_ovs-ha': + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - 'os-nosdn-ovs-ha': auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - 'os-nosdn-vlan-ha': auto-trigger-name: 'fuel-{scenario}-{pod}-trigger' - - 'os-odl_l2-nofeature-ha': - auto-trigger-name: 'fuel-{scenario}-{pod}-trigger' - - 'os-odl_l3-nofeature-ha': + # NOHA scenarios + - 'os-odl_l2-nofeature-noha': auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - - 'os-onos-nofeature-ha': + - 'os-odl_l3-nofeature-noha': + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + - 'os-onos-nofeature-noha': + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + - 'os-nosdn-nofeature-noha': + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + - 'os-nosdn-kvm-noha': + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + - 'os-nosdn-kvm_ovs-noha': + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + - 'os-nosdn-ovs-noha': + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + - 'os-odl_l2-bgpvpn-noha': auto-trigger-name: 'brahmaputra-trigger-daily-disabled' jobs: @@ -63,13 +83,15 @@ - 'fuel-deploy-{pod}-daily-{stream}' ######################## -# job templates - old type of defining the scenario +# job templates ######################## - job-template: name: 'fuel-{scenario}-{pod}-daily-{stream}' project-type: multijob + node: intel-build + concurrent: false properties: @@ -92,7 +114,6 @@ parameters: - project-parameter: project: '{project}' - - '{pod}-defaults' - '{installer}-defaults' - string: name: DEPLOY_SCENARIO @@ -106,21 +127,24 @@ condition: SUCCESSFUL projects: - name: 'fuel-deploy-{pod}-daily-{stream}' - current-parameters: true + current-parameters: false + predefined-parameters: 'DEPLOY_SCENARIO={scenario}' kill-phase-on: FAILURE - multijob: name: functest condition: COMPLETED projects: - name: 'functest-fuel-{pod}-daily-{stream}' - current-parameters: true + current-parameters: false + predefined-parameters: 'DEPLOY_SCENARIO={scenario}' kill-phase-on: NEVER - multijob: name: yardstick condition: COMPLETED projects: - name: 'yardstick-fuel-{pod}-daily-{stream}' - current-parameters: true + current-parameters: false + predefined-parameters: 'DEPLOY_SCENARIO={scenario}' kill-phase-on: NEVER - job-template: @@ -143,6 +167,9 @@ project: '{project}' - '{pod}-defaults' - '{installer}-defaults' + - string: + name: DEPLOY_SCENARIO + default: 'os-odl_l2-nofeature-ha' - fuel-ci-parameter: gs-pathname: '{gs-pathname}' diff --git a/jjb/fuel/fuel-deploy-virtual.sh b/jjb/fuel/fuel-deploy-virtual.sh deleted file mode 100755 index e7c83b77f..000000000 --- a/jjb/fuel/fuel-deploy-virtual.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/bash -set -o errexit -set -o nounset -set -o pipefail - -# source the file so we get OPNFV vars -source latest.properties - -# echo the info about artifact that is used during the deployment -echo "Using $(echo $OPNFV_ARTIFACT_URL | cut -d'/' -f3) for deployment" - -# checkout the commit that was used for building the downloaded artifact -# to make sure the ISO and deployment mechanism uses same versions -echo "Checking out $OPNFV_GIT_SHA1" -git checkout $OPNFV_GIT_SHA1 --quiet - -# create TMPDIR if it doesn't exist -export TMPDIR=$HOME/tmpdir -mkdir -p $TMPDIR - -# change permissions down to TMPDIR -chmod a+x $HOME -chmod a+x $TMPDIR - -# get the lab name from SLAVE_NAME -# we currently support ericsson and intel labs -LAB_NAME=${NODE_NAME%%-*} -if [[ ! "$LAB_NAME" =~ (ericsson|intel) ]]; then - echo "Unsupported/unidentified lab $LAB_NAME. Cannot continue!" - exit 1 -else - echo "Using configuration for $LAB_NAME" -fi - -# set CONFDIR, BRIDGE -CONFDIR=$WORKSPACE/deploy/templates/$LAB_NAME/virtual_environment/noha/conf -BRIDGE=pxebr - -# log info to console -echo "Starting the deployment for a merged change using $INSTALLER_TYPE. This could take some time..." -echo "--------------------------------------------------------" -echo - -# start the deployment -echo "Issuing command" -echo "sudo $WORKSPACE/ci/deploy.sh -iso $WORKSPACE/opnfv.iso -dea $CONFDIR/dea.yaml -dha $CONFDIR/dha.yaml -s $TMPDIR -b $BRIDGE -nh" - -sudo $WORKSPACE/ci/deploy.sh -iso $WORKSPACE/opnfv.iso -dea $CONFDIR/dea.yaml -dha $CONFDIR/dha.yaml -s $TMPDIR -b $BRIDGE -nh - -echo -echo "--------------------------------------------------------" -echo "Virtual deployment is done! Removing the intermediate files from artifact repo" - -PROPERTIES_FILE=$(echo $OPNFV_ARTIFACT_URL | sed 's/iso/properties/') -gsutil rm gs://$OPNFV_ARTIFACT_URL -gsutil rm gs://$PROPERTIES_FILE diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh index 6875a09e7..b0a1c78f1 100755 --- a/jjb/fuel/fuel-deploy.sh +++ b/jjb/fuel/fuel-deploy.sh @@ -9,24 +9,38 @@ source latest.properties # echo the info about artifact that is used during the deployment echo "Using ${OPNFV_ARTIFACT_URL/*\/} for deployment" -# checkout the commit that was used for building the downloaded artifact -# to make sure the ISO and deployment mechanism uses same versions -echo "Checking out $OPNFV_GIT_SHA1" -git checkout $OPNFV_GIT_SHA1 --quiet +if [[ "$JOB_NAME" =~ "merge" ]]; then + # set simplest scenario for virtual deploys to run for merges + DEPLOY_SCENARIO="os-nosdn-nofeature-ha" +else + # for none-merge deployments + # checkout the commit that was used for building the downloaded artifact + # to make sure the ISO and deployment mechanism uses same versions + echo "Checking out $OPNFV_GIT_SHA1" + git checkout $OPNFV_GIT_SHA1 --quiet +fi # set deployment parameters -BRIDGE=pxebr export TMPDIR=$HOME/tmpdir +BRIDGE=pxebr LAB_NAME=${NODE_NAME/-*} POD_NAME=${NODE_NAME/*-} +if [[ "$NODE_NAME" == "opnfv-jump-2" ]]; then + LAB_NAME="lf" + POD_NAME="pod2" +fi + if [[ "$NODE_NAME" =~ "virtual" ]]; then POD_NAME="virtual_kvm" fi -if [[ "$NODE_NAME" == "opnfv-jump-2" ]]; then - LAB_NAME="lf" - POD_NAME="pod2" +# we currently support ericsson, intel, and lf labs +if [[ ! "$LAB_NAME" =~ (ericsson|intel|lf) ]]; then + echo "Unsupported/unidentified lab $LAB_NAME. Cannot continue!" + exit 1 +else + echo "Using configuration for $LAB_NAME" fi # create TMPDIR if it doesn't exist diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml index 95bc3a6b4..cedb4eee2 100644 --- a/jjb/fuel/fuel-project-jobs.yml +++ b/jjb/fuel/fuel-project-jobs.yml @@ -194,6 +194,10 @@ enabled: true max-total: 2 max-per-node: 1 + - build-blocker: + use-build-blocker: true + blocking-jobs: + - 'fuel-deploy-virtual-daily-.*' parameters: - project-parameter: @@ -214,25 +218,25 @@ - ssh-agent-credentials: users: '{ssh-credentials}' -# triggers: -# - gerrit: -# trigger-on: -# - change-merged-event -# - comment-added-contains-event: -# comment-contains-value: 'remerge' -# projects: -# - project-compare-type: 'ANT' -# project-pattern: '{project}' -# branches: -# - branch-compare-type: 'ANT' -# branch-pattern: '**/{branch}' -# dependency-jobs: 'fuel-merge-build-{stream}' + triggers: + - gerrit: + trigger-on: + - change-merged-event + - comment-added-contains-event: + comment-contains-value: 'remerge' + projects: + - project-compare-type: 'ANT' + project-pattern: '{project}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + dependency-jobs: 'fuel-merge-build-{stream}' builders: - shell: !include-raw-escape: ./fuel-download-artifact.sh - shell: - !include-raw-escape: ./fuel-deploy-virtual.sh + !include-raw-escape: ./fuel-deploy.sh - shell: !include-raw-escape: ./fuel-workspace-cleanup.sh diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index ee6e7d6b7..6c33bd0a5 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -32,6 +32,9 @@ - huawei-us-deploy-bare-1: installer: compass <<: *brahmaputra + - ericsson-pod1: + installer: fuel + <<: *brahmaputra #-------------------------------- # master #-------------------------------- @@ -81,6 +84,9 @@ - '{pod}-defaults' - '{installer}-defaults' - 'functest-{testsuite}-parameter' + - string: + name: DEPLOY_SCENARIO + default: 'os-odl_l2-nofeature-ha' - functest-parameter: gs-pathname: '{gs-pathname}' @@ -112,6 +118,10 @@ - 'tempest' - 'rally' - 'odl' + - 'onos' + - 'ovno' + - 'promise' + - 'doctor' - 'vims' - 'vping' - parameter: @@ -132,7 +142,7 @@ - string: name: CI_DEBUG default: 'false' - description: "Show debut output information" + description: "Show debug output information" ######################## # trigger macros ######################## @@ -212,7 +222,7 @@ dir_result="${HOME}/opnfv/functest/reports" mkdir -p ${dir_result} - rm -rf ${dir_result}/* + sudo rm -rf ${dir_result}/* res_volume="-v ${dir_result}:/home/opnfv/functest/results" docker pull opnfv/functest:latest_stable >$redirect diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml index 12a49f314..9bb3265f2 100644 --- a/jjb/joid/joid-ci-jobs.yml +++ b/jjb/joid/joid-ci-jobs.yml @@ -69,6 +69,8 @@ project-type: multijob + node: intel-build + concurrent: false properties: @@ -92,7 +94,6 @@ - project-parameter: project: '{project}' - '{installer}-defaults' - - '{pod}-defaults' - string: name: DEPLOY_SCENARIO default: '{scenario}' @@ -103,21 +104,24 @@ condition: SUCCESSFUL projects: - name: 'joid-deploy-{pod}-daily-{stream}' - current-parameters: true + current-parameters: false + predefined-parameters: 'DEPLOY_SCENARIO={scenario}' kill-phase-on: FAILURE - multijob: name: functest condition: COMPLETED projects: - name: 'functest-joid-{pod}-daily-{stream}' - current-parameters: true + current-parameters: false + predefined-parameters: 'DEPLOY_SCENARIO={scenario}' kill-phase-on: NEVER - multijob: name: yardstick condition: COMPLETED projects: - name: 'yardstick-joid-{pod}-daily-{stream}' - current-parameters: true + current-parameters: false + predefined-parameters: 'DEPLOY_SCENARIO={scenario}' kill-phase-on: NEVER - job-template: diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml index 0ed486524..9dd3d5406 100644 --- a/jjb/opnfv/installer-params.yml +++ b/jjb/opnfv/installer-params.yml @@ -30,10 +30,6 @@ default: compass 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: 'ext-net' description: 'external network for test' @@ -50,10 +46,6 @@ default: fuel 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: 'net04_ext' description: 'external network for test' @@ -70,10 +62,6 @@ default: joid description: 'Installer used for deploying OPNFV on this POD' - string: - name: DEPLOY_SCENARIO - default: 'none' - description: 'Scenario to deploy and test' - - string: name: OS_RELEASE default: 'liberty' description: 'OpenStack release (kilo|liberty)' diff --git a/jjb/opnfv/opnfv-docker.sh b/jjb/opnfv/opnfv-docker.sh index 108485d0b..bf355973c 100644 --- a/jjb/opnfv/opnfv-docker.sh +++ b/jjb/opnfv/opnfv-docker.sh @@ -10,17 +10,12 @@ echo # Remove previous running containers if exist -if [[ ! -z $(docker ps -a | grep $DOCKER_REPO_NAME) ]]; then +if [[ -n "$(docker ps -a | grep $DOCKER_REPO_NAME)" ]]; then echo "Removing existing $DOCKER_REPO_NAME containers..." - #docker ps | grep $DOCKER_REPO_NAME | awk '{print $1}' | xargs docker stop docker ps -a | grep $DOCKER_REPO_NAME | awk '{print $1}' | xargs docker rm -f t=60 # Wait max 60 sec for containers to be removed - while [[ $t -gt 0 ]]; do - ids=$(docker ps | grep $DOCKER_REPO_NAME |awk '{print $1}') - if [[ -z $ids ]]; then - break - fi + while [[ $t -gt 0 ]] && [[ -n "$(docker ps| grep $DOCKER_REPO_NAME)" ]]; do sleep 1 let t=t-1 done @@ -28,13 +23,15 @@ fi # Remove existing images if exist -if [[ ! -z $(docker images | grep $DOCKER_REPO_NAME) ]]; then +if [[ -n "$(docker images | grep $DOCKER_REPO_NAME)" ]]; then echo "Docker images to remove:" docker images | head -1 && docker images | grep $DOCKER_REPO_NAME image_tags=($(docker images | grep $DOCKER_REPO_NAME | awk '{print $2}')) for tag in "${image_tags[@]}"; do - echo "Removing docker image $DOCKER_REPO_NAME:$tag..." - docker rmi -f $DOCKER_REPO_NAME:$tag + if [[ -n "$(docker images|grep $DOCKER_REPO_NAME|grep $tag)" ]]; then + echo "Removing docker image $DOCKER_REPO_NAME:$tag..." + docker rmi -f $DOCKER_REPO_NAME:$tag + fi done fi diff --git a/jjb/opnfv/opnfv-docs.yml b/jjb/opnfv/opnfv-docs.yml index 31f5d00fd..884b8b070 100644 --- a/jjb/opnfv/opnfv-docs.yml +++ b/jjb/opnfv/opnfv-docs.yml @@ -53,7 +53,7 @@ projects: - project-compare-type: 'REG_EXP' #Left out arno projects oscar|octopus|functest|genesis - project-pattern: 'vswitchperf|yardstick|apex|availability|bottlenecks|compass4nfv|conductor|copper|doctor|dovetail|dpacc|escalator|fastpathmetrics|fuel|inspector|ipv6|joid|kvmfornfv|lsoapi|moon|movie|multisite|onosfw|ovsnfv|parser|prediction|promise|qtip|releng|rs|sdnvpn|sfc|vnf_forwarding_graph|enfv|pinpoint|pharos|opnfvdocs|cperf|functest' + project-pattern: 'vswitchperf|yardstick|apex|availability|bottlenecks|compass4nfv|conductor|copper|doctor|dovetail|dpacc|escalator|fastpathmetrics|fuel|inspector|ipv6|joid|kvmfornfv|lsoapi|moon|movie|multisite|onosfw|ovsnfv|parser|prediction|promise|qtip|releng|rs|sdnvpn|sfc|vnf_forwarding_graph|enfv|pinpoint|pharos|cperf|functest' branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' @@ -91,7 +91,7 @@ comment-contains-value: 'remerge' projects: - project-compare-type: 'REG_EXP' - project-pattern: 'vswitchperf|yardstick|apex|availability|bottlenecks|compass4nfv|conductor|copper|doctor|dovetail|dpacc|escalator|fastpathmetrics|fuel|inspector|ipv6|joid|kvmfornfv|lsoapi|moon|movie|multisite|onosfw|ovsnfv|parser|prediction|promise|qtip|releng|rs|sdnvpn|sfc|vnf_forwarding_graph|enfv|pinpoint|pharos|opnfvdocs|cperf|functest' + project-pattern: 'vswitchperf|yardstick|apex|availability|bottlenecks|compass4nfv|conductor|copper|doctor|dovetail|dpacc|escalator|fastpathmetrics|fuel|inspector|ipv6|joid|kvmfornfv|lsoapi|moon|movie|multisite|onosfw|ovsnfv|parser|prediction|promise|qtip|releng|rs|sdnvpn|sfc|vnf_forwarding_graph|enfv|pinpoint|pharos|cperf|functest' branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index f173bd928..c6078c613 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -39,10 +39,6 @@ name: GIT_BASE default: ssh://gerrit.opnfv.org:29418/$PROJECT description: 'Git URL to use on this Jenkins Slave' - - string: - name: POD_CONF_DIR - default: $WORKSPACE/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2 - description: 'Directory where POD configuration files are located.' - parameter: name: 'ericsson-pod1-defaults' @@ -85,10 +81,6 @@ name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - - string: - name: POD_CONF_DIR - default: $WORKSPACE/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/pod2 - description: 'Directory where POD configuration files are located.' - parameter: name: 'intelpod2-jumphost-defaults' diff --git a/jjb/qtip/qtip.yml b/jjb/qtip/qtip.yml index 9c627b8af..450ba938e 100644 --- a/jjb/qtip/qtip.yml +++ b/jjb/qtip/qtip.yml @@ -105,6 +105,7 @@ - 'qtip-cleanup' - 'qtip-set-env' - 'qtip-run-suite' + - 'qtip-pushtoDB' triggers: - timed: '0 0,13,15,20 * * *' @@ -137,12 +138,31 @@ builders: - shell: | #!/bin/bash - echo "The container id is:" container_id=$(docker ps | grep 'opnfv/qtip:latest' | awk '{print $1}' | head -1) - echo $container_id - QTIP_REPO=/home/opnfv/repos/qtip - docker exec -t ${container_id} $QTIP_REPO/docker/run_qtip.sh + if [[ ! -z ${container_id} ]]; then + echo "The container ID is: ${container_id}" + QTIP_REPO=/home/opnfv/repos/qtip + docker exec -t ${container_id} $QTIP_REPO/docker/run_qtip.sh + else + echo "Container ID not available" + fi + +- builder: + name: qtip-pushtoDB + builders: + - shell: | + #!/bin/bash + echo "Pushing available results to DB" + echo "The container id is:" + container_id=$(docker ps | grep 'opnfv/qtip:latest' | awk '{print $1}' | head -1) + if [[ ! -z ${container_id} ]]; then + echo "The condiner ID is: ${container_id}" + QTIP_REPO=/home/opnfv/repos/qtip + docker exec -t ${container_id} $QTIP_REPO/docker/push_db.sh + else + echo "Container ID not available" + fi - builder: name: qtip-cleanup diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml index 56582c90a..e07856c31 100644 --- a/jjb/yardstick/yardstick-ci-jobs.yml +++ b/jjb/yardstick/yardstick-ci-jobs.yml @@ -35,6 +35,9 @@ - huawei-us-deploy-bare-1: installer: compass <<: *brahmaputra + - ericsson-pod1: + installer: fuel + <<: *brahmaputra #-------------------------------- # master #-------------------------------- @@ -85,6 +88,9 @@ - '{installer}-defaults' - 'yardstick-params-{pod}' - string: + name: DEPLOY_SCENARIO + default: 'os-odl_l2-nofeature-ha' + - string: name: YARDSTICK_SUITE_NAME default: opnfv_${{NODE_NAME}}_{loop}.yaml description: 'Path to test suite' @@ -127,8 +133,11 @@ grep -Eo "[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+") INSTALLER_IP=$(/usr/sbin/arp -e | grep ${instack_mac} | awk {'print $1'}) sshkey="-v /root/.ssh/id_rsa:/root/.ssh/id_rsa" - sudo iptables -D FORWARD -o virbr0 -j REJECT --reject-with icmp-port-unreachable - sudo iptables -D FORWARD -i virbr0 -j REJECT --reject-with icmp-port-unreachable + if [[ -n $(sudo iptables -L FORWARD |grep "REJECT"|grep "reject-with icmp-port-unreachable") ]]; then + #note: this happens only in opnfv-lf-pod1 + sudo iptables -D FORWARD -o virbr0 -j REJECT --reject-with icmp-port-unreachable + sudo iptables -D FORWARD -i virbr0 -j REJECT --reject-with icmp-port-unreachable + fi elif [[ ${INSTALLER_TYPE} == 'joid' ]]; then # If production lab then creds may be retrieved dynamically # creds are on the jumphost, always in the same folder @@ -138,13 +147,16 @@ fi opts="--privileged=true --rm" - envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} -e NODE_NAME=${NODE_NAME} -e EXTERNAL_NETWORK=${EXTERNAL_NETWORK} -e YARDSTICK_BRANCH=${GIT_BRANCH##origin/}" + envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \ + -e NODE_NAME=${NODE_NAME} -e EXTERNAL_NETWORK=${EXTERNAL_NETWORK} \ + -e YARDSTICK_BRANCH=${GIT_BRANCH##origin/} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO}" # Pull the latest image docker pull opnfv/yardstick >$redirect # Run docker - cmd="sudo docker run ${opts} ${envs} ${labconfig} ${sshkey} opnfv/yardstick run_tests.sh ${YARDSTICK_DB_BACKEND} ${YARDSTICK_SUITE_NAME}" + cmd="sudo docker run ${opts} ${envs} ${labconfig} ${sshkey} opnfv/yardstick \ + run_tests.sh ${YARDSTICK_DB_BACKEND} ${YARDSTICK_SUITE_NAME}" echo "Yardstick: Running docker cmd: ${cmd}" ${cmd} diff --git a/utils/docs-build.sh b/utils/docs-build.sh index 7c444e3d8..b397094c6 100755 --- a/utils/docs-build.sh +++ b/utils/docs-build.sh @@ -137,7 +137,11 @@ prepare_src_files find $DOCS_DIR -name $INDEX_RST -printf '%h\n' | while read dir do name=$(generate_name $dir) - src="$SRC_DIR/${dir#$DOCS_DIR/}" + if is_top_dir "$dir" ; then + src="$SRC_DIR" + else + src="$SRC_DIR/${dir#$DOCS_DIR/}" + fi build="$BUILD_DIR/$name" output="$OUTPUT_DIR/$name" conf="$src/conf.py" |