diff options
27 files changed, 70 insertions, 658 deletions
diff --git a/docs/ci/tables/ci-baremetal-servers.rst b/docs/ci/tables/ci-baremetal-servers.rst index 1bdc956ea..db0a1a9e7 100644 --- a/docs/ci/tables/ci-baremetal-servers.rst +++ b/docs/ci/tables/ci-baremetal-servers.rst @@ -11,11 +11,6 @@ - Jumphost OS / Version - PDF - IDF - * - `arm-pod6 <https://build.opnfv.org/ci/computer/arm-pod6>`_ - - Armband - - Ubuntu 16.04 - - `PDF <https://git.opnfv.org/pharos/plain/labs/arm/pod6.yaml>`__ - - `IDF <https://git.opnfv.org/pharos/plain/labs/arm/idf-pod6.yaml>`__ * - `arm-pod9 <https://build.opnfv.org/ci/computer/arm-pod9>`_ - Armband - Ubuntu 16.04 diff --git a/docs/ci/tables/ci-build-servers.rst b/docs/ci/tables/ci-build-servers.rst index b58b0fc9b..ad168653e 100644 --- a/docs/ci/tables/ci-build-servers.rst +++ b/docs/ci/tables/ci-build-servers.rst @@ -16,15 +16,7 @@ - `Armband ENEA Team`_ * - `arm-build4 <https://build.opnfv.org/ci/computer/arm-build4>`_ - aarch64 - - CentOS 7.4 - - `Armband ENEA Team`_ - * - `arm-build5 <https://build.opnfv.org/ci/computer/arm-build5>`_ - - aarch64 - - CentOS 7.4 - - `Armband ENEA Team`_ - * - `arm-build6 <https://build.opnfv.org/ci/computer/arm-build6>`_ - - aarch64 - - CentOS 7.4 + - Ubuntu 16.04 - `Armband ENEA Team`_ * - `ericsson-build3 <https://build.opnfv.org/ci/computer/ericsson-build3>`_ - x86_64 diff --git a/docs/ci/tables/none-ci-servers.rst b/docs/ci/tables/none-ci-servers.rst index c4f403a64..48cf97b50 100644 --- a/docs/ci/tables/none-ci-servers.rst +++ b/docs/ci/tables/none-ci-servers.rst @@ -11,11 +11,6 @@ - Jumphost OS / Version - PDF - IDF - * - `arm-pod5 <https://build.opnfv.org/ci/computer/arm-pod5>`_ - - Armband - - Ubuntu 16.04 - - `PDF <https://git.opnfv.org/pharos/plain/labs/arm/pod5.yaml>`__ - - `IDF <https://git.opnfv.org/pharos/plain/labs/arm/idf-pod5.yaml>`__ * - cacti-pod1 - - diff --git a/jjb/armband/armband-ci-jobs.yaml b/jjb/armband/armband-ci-jobs.yaml index 568cb9b9d..a100f49b4 100644 --- a/jjb/armband/armband-ci-jobs.yaml +++ b/jjb/armband/armband-ci-jobs.yaml @@ -23,7 +23,7 @@ stream: gambia branch: 'stable/{stream}' gs-pathname: '/{stream}' - disabled: false + disabled: true functest_docker_tag: '{stream}' # ------------------------------- # DEPLOY TYPE ANCHORS diff --git a/jjb/armband/armband-rtd-jobs.yaml b/jjb/armband/armband-rtd-jobs.yaml index 130400899..70d2f1171 100644 --- a/jjb/armband/armband-rtd-jobs.yaml +++ b/jjb/armband/armband-rtd-jobs.yaml @@ -14,7 +14,7 @@ disabled: false - gambia: branch: 'stable/{stream}' - disabled: false + disabled: true jobs: - '{project-name}-rtd-jobs' diff --git a/jjb/armband/armband-verify-jobs.yaml b/jjb/armband/armband-verify-jobs.yaml index 0b44a0233..d7a646ad0 100644 --- a/jjb/armband/armband-verify-jobs.yaml +++ b/jjb/armband/armband-verify-jobs.yaml @@ -15,7 +15,7 @@ - gambia: branch: 'stable/{stream}' gs-pathname: '/{stream}' - disabled: false + disabled: true ##################################### # jobs ##################################### diff --git a/jjb/domino/domino-rtd-jobs.yaml b/jjb/domino/domino-rtd-jobs.yaml deleted file mode 100644 index 26f254760..000000000 --- a/jjb/domino/domino-rtd-jobs.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -- project: - name: domino-rtd - project: domino - project-name: domino - - gerrit-skip-vote: true - project-pattern: 'domino' - rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-domino/47363/' - rtd-token: 'c89c7fc281d94a985df61b49be2b824f544ba6fd' - - jobs: - - '{project-name}-rtd-jobs' diff --git a/jjb/domino/domino.yaml b/jjb/domino/domino.yaml deleted file mode 100644 index e91260463..000000000 --- a/jjb/domino/domino.yaml +++ /dev/null @@ -1,57 +0,0 @@ ---- -- project: - name: domino - - project: '{name}' - - jobs: - - 'domino-verify-{stream}' - - stream: - - master: - branch: '{stream}' - gs-pathname: '' - disabled: false - -- job-template: - name: 'domino-verify-{stream}' - - disabled: '{obj:disabled}' - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - 'opnfv-build-ubuntu-defaults' - - scm: - - git-scm-gerrit - - triggers: - - gerrit: - server-name: 'gerrit.opnfv.org' - trigger-on: - - patchset-created-event: - exclude-drafts: 'false' - exclude-trivial-rebase: 'false' - exclude-no-code-change: 'false' - - draft-published-event - - comment-added-contains-event: - comment-contains-value: 'recheck' - - comment-added-contains-event: - comment-contains-value: 'reverify' - projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - disable-strict-forbidden-file-verification: 'true' - forbidden-file-paths: - - compare-type: ANT - pattern: 'docs/**|.gitignore' - - builders: - - shell: | - #!/bin/bash - ./tests/run.sh diff --git a/jjb/escalator/escalator-basic.sh b/jjb/escalator/escalator-basic.sh deleted file mode 100755 index 9c739c422..000000000 --- a/jjb/escalator/escalator-basic.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -echo "--------------------------------------------------------" -echo "This is escalator basic job!" -echo "--------------------------------------------------------" - diff --git a/jjb/escalator/escalator-build.sh b/jjb/escalator/escalator-build.sh deleted file mode 100755 index 0e35c27d9..000000000 --- a/jjb/escalator/escalator-build.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -echo "--------------------------------------------------------" -echo "This is escalator build job!" -echo "--------------------------------------------------------" - -# set OPNFV_ARTIFACT_VERSION -if [[ "$JOB_NAME" =~ "merge" ]]; then - echo "Building Escalator TAR for a merged change" - export OPNFV_ARTIFACT_VERSION="gerrit-$GERRIT_CHANGE_NUMBER" -else - export OPNFV_ARTIFACT_VERSION=$(date -u +"%Y-%m-%d_%H-%M-%S") -fi - -# build output directory -OUTPUT_DIR=$WORKSPACE/build_output -mkdir -p $OUTPUT_DIR - -# start the build -cd $WORKSPACE -./ci/build.sh $OUTPUT_DIR $OPNFV_ARTIFACT_VERSION - -# save information regarding artifact into file -( - echo "OPNFV_ARTIFACT_VERSION=$OPNFV_ARTIFACT_VERSION" - echo "OPNFV_GIT_URL=$(git config --get remote.origin.url)" - echo "OPNFV_GIT_SHA1=$(git rev-parse HEAD)" - echo "OPNFV_ARTIFACT_URL=$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.bin" - echo "OPNFV_BUILD_URL=$BUILD_URL" -) > $WORKSPACE/opnfv.properties - -echo -echo "--------------------------------------------------------" -echo "Done!" diff --git a/jjb/escalator/escalator-rtd-jobs.yaml b/jjb/escalator/escalator-rtd-jobs.yaml deleted file mode 100644 index 762051c96..000000000 --- a/jjb/escalator/escalator-rtd-jobs.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -- project: - name: escalator-rtd - project: escalator - project-name: escalator - - gerrit-skip-vote: true - project-pattern: 'escalator' - rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-escalator/47365/' - rtd-token: 'cb75c70dab564cb40e6d9e8f2a99ced96f5b79b1' - - jobs: - - '{project-name}-rtd-jobs' diff --git a/jjb/escalator/escalator-upload-artifact.sh b/jjb/escalator/escalator-upload-artifact.sh deleted file mode 100755 index 781fb3e3e..000000000 --- a/jjb/escalator/escalator-upload-artifact.sh +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/bash -echo "--------------------------------------------------------" -echo "This is escalator upload job!" -echo "--------------------------------------------------------" - -set -o pipefail - -# check if we built something -if [ -f $WORKSPACE/.noupload ]; then - echo "Nothing new to upload. Exiting." - /bin/rm -f $WORKSPACE/.noupload - exit 0 -fi - -# source the opnfv.properties to get ARTIFACT_VERSION -source $WORKSPACE/opnfv.properties - -importkey () { -# clone releng repository -echo "Cloning releng repository..." -[ -d releng ] && rm -rf releng -git clone https://gerrit.opnfv.org/gerrit/releng $WORKSPACE/releng/ &> /dev/null -#this is where we import the siging key -if [ -f $WORKSPACE/releng/utils/gpg_import_key.sh ]; then - source $WORKSPACE/releng/utils/gpg_import_key.sh -fi -} - -signtar () { -gpg2 -vvv --batch --yes --no-tty \ - --default-key opnfv-helpdesk@rt.linuxfoundation.org \ - --passphrase besteffort \ - --detach-sig $BUILD_DIRECTORY/opnfv-$OPNFV_ARTIFACT_VERSION.tar.gz - -gsutil cp $BUILD_DIRECTORY/opnfv-$OPNFV_ARTIFACT_VERSION.tar.gz.sig gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.tar.gz.sig -echo "TAR signature Upload Complete!" -} - -uploadtar () { -# log info to console -echo "Uploading $INSTALLER_TYPE artifact. This could take some time..." -echo - -cd $WORKSPACE -# upload artifact and additional files to google storage -gsutil cp $BUILD_DIRECTORY/opnfv-$OPNFV_ARTIFACT_VERSION.tar.gz \ - gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.tar.gz > gsutil.tar.log 2>&1 -gsutil cp $WORKSPACE/opnfv.properties \ - gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.properties > gsutil.properties.log 2>&1 -if [[ ! "$JOB_NAME" =~ (verify|merge) ]]; then - gsutil cp $WORKSPACE/opnfv.properties \ - gs://$GS_URL/latest.properties > gsutil.latest.log 2>&1 -elif [[ "$JOB_NAME" =~ "merge" ]]; then - echo "Uploaded Escalator TAR for a merged change" -fi - -gsutil -m setmeta \ - -h "Content-Type:text/html" \ - -h "Cache-Control:private, max-age=0, no-transform" \ - gs://$GS_URL/latest.properties \ - gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.properties > /dev/null 2>&1 - -gsutil -m setmeta \ - -h "Cache-Control:private, max-age=0, no-transform" \ - gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.tar.gz > /dev/null 2>&1 - -# disabled errexit due to gsutil setmeta complaints -# BadRequestException: 400 Invalid argument -# check if we uploaded the file successfully to see if things are fine -gsutil ls gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.tar.gz > /dev/null 2>&1 -if [[ $? -ne 0 ]]; then - echo "Problem while uploading artifact!" - echo "Check log $WORKSPACE/gsutil.bin.log on the machine where this build is done." - exit 1 -fi - -echo "Done!" -echo -echo "--------------------------------------------------------" -echo -echo "Artifact is available as http://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.tar.gz" -echo -echo "--------------------------------------------------------" -echo -} - -importkey -signtar -uploadtar diff --git a/jjb/escalator/escalator.yaml b/jjb/escalator/escalator.yaml deleted file mode 100644 index d203dc113..000000000 --- a/jjb/escalator/escalator.yaml +++ /dev/null @@ -1,317 +0,0 @@ ---- -- project: - name: 'escalator' - - project: 'escalator' - - ##################################### - # branch definitions - ##################################### - stream: - - master: - branch: '{stream}' - gs-pathname: '' - disabled: false - - ##################################### - # phases - ##################################### - phase: - - 'basic': - slave-label: 'opnfv-build-centos' - - 'build': - slave-label: 'opnfv-build-centos' - - ##################################### - # jobs - ##################################### - jobs: - - 'escalator-verify-{stream}' - - 'escalator-verify-{phase}-{stream}' - - 'escalator-merge-{stream}' - - 'escalator-merge-{phase}-{stream}' - -##################################### -# job templates -##################################### -- job-template: - name: 'escalator-verify-{stream}' - - project-type: multijob - - disabled: false - - concurrent: true - - properties: - - logrotate-default - - throttle: - enabled: true - max-total: 4 - option: 'project' - - scm: - - git-scm-gerrit - - wrappers: - - ssh-agent-wrapper - - timeout: - timeout: 360 - fail: true - - triggers: - - gerrit: - server-name: 'gerrit.opnfv.org' - trigger-on: - - patchset-created-event: - exclude-drafts: 'false' - exclude-trivial-rebase: 'false' - exclude-no-code-change: 'false' - - draft-published-event - - comment-added-contains-event: - comment-contains-value: 'recheck' - - comment-added-contains-event: - comment-contains-value: 'reverify' - projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - disable-strict-forbidden-file-verification: 'true' - forbidden-file-paths: - - compare-type: ANT - pattern: 'docs/**|.gitignore' - readable-message: true - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - 'opnfv-build-defaults' - - 'escalator-defaults': - gs-pathname: '{gs-pathname}' - - builders: - - description-setter: - description: "Built on $NODE_NAME" - - multijob: - name: basic - condition: SUCCESSFUL - projects: - - name: 'escalator-verify-basic-{stream}' - current-parameters: false - predefined-parameters: | - BRANCH=$BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC - GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER - GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - node-parameters: false - kill-phase-on: FAILURE - abort-all-job: true - - multijob: - name: build - condition: SUCCESSFUL - projects: - - name: 'escalator-verify-build-{stream}' - current-parameters: false - predefined-parameters: | - BRANCH=$BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC - GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER - GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - node-parameters: false - kill-phase-on: FAILURE - abort-all-job: true - -- job-template: - name: 'escalator-verify-{phase}-{stream}' - - disabled: '{obj:disabled}' - - concurrent: true - - scm: - - git-scm-gerrit - - wrappers: - - ssh-agent-wrapper - - timeout: - timeout: 360 - fail: true - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - '{slave-label}-defaults' - - 'escalator-defaults': - gs-pathname: '{gs-pathname}' - - builders: - - description-setter: - description: "Built on $NODE_NAME" - - '{project}-verify-{phase}-macro' - -- job-template: - name: 'escalator-merge-{stream}' - - project-type: multijob - - disabled: false - - concurrent: true - - properties: - - logrotate-default - - throttle: - enabled: true - max-total: 4 - option: 'project' - - scm: - - git-scm-gerrit - - wrappers: - - ssh-agent-wrapper - - timeout: - timeout: 360 - fail: true - - triggers: - - gerrit: - server-name: 'gerrit.opnfv.org' - 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}' - disable-strict-forbidden-file-verification: 'true' - forbidden-file-paths: - - compare-type: ANT - pattern: 'docs/**|.gitignore' - readable-message: true - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - 'opnfv-build-defaults' - - 'escalator-defaults': - gs-pathname: '{gs-pathname}' - - builders: - - description-setter: - description: "Built on $NODE_NAME" - - multijob: - name: basic - condition: SUCCESSFUL - projects: - - name: 'escalator-merge-basic-{stream}' - current-parameters: false - predefined-parameters: | - BRANCH=$BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC - GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER - GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - node-parameters: false - kill-phase-on: FAILURE - abort-all-job: true - - multijob: - name: build - condition: SUCCESSFUL - projects: - - name: 'escalator-merge-build-{stream}' - current-parameters: false - predefined-parameters: | - BRANCH=$BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC - GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER - GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - node-parameters: false - kill-phase-on: FAILURE - abort-all-job: true - -- job-template: - name: 'escalator-merge-{phase}-{stream}' - - disabled: '{obj:disabled}' - - concurrent: true - - scm: - - git-scm - - wrappers: - - ssh-agent-wrapper - - timeout: - timeout: 360 - fail: true - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - '{slave-label}-defaults' - - 'escalator-defaults': - gs-pathname: '{gs-pathname}' - - builders: - - description-setter: - description: "Built on $NODE_NAME" - - '{project}-merge-{phase}-macro' - -##################################### -# builder macros -##################################### -- builder: - name: 'escalator-verify-basic-macro' - builders: - - shell: - !include-raw: ./escalator-basic.sh - -- builder: - name: 'escalator-verify-build-macro' - builders: - - shell: - !include-raw: ./escalator-build.sh - -- builder: - name: 'escalator-merge-basic-macro' - builders: - - shell: - !include-raw: ./escalator-basic.sh - -# yamllint disable rule:indentation -- builder: - name: 'escalator-merge-build-macro' - builders: - - shell: - !include-raw: - - ./escalator-build.sh - - ./escalator-upload-artifact.sh -# yamllint enable rule:indentation - -##################################### -# parameter macros -##################################### -- parameter: - name: 'escalator-defaults' - parameters: - - string: - name: BUILD_DIRECTORY - default: $WORKSPACE/build_output - description: "Directory where the build artifact will be located upon the completion of the build." - - string: - name: CACHE_DIRECTORY - default: $HOME/opnfv/cache/$INSTALLER_TYPE - description: "Directory where the cache to be used during the build is located." - - string: - name: GS_URL - default: artifacts.opnfv.org/$PROJECT{gs-pathname} - description: "URL to Google Storage." diff --git a/jjb/fuel/fuel-daily-jobs.yaml b/jjb/fuel/fuel-daily-jobs.yaml index f90c5ef3a..982b83e09 100644 --- a/jjb/fuel/fuel-daily-jobs.yaml +++ b/jjb/fuel/fuel-daily-jobs.yaml @@ -26,7 +26,7 @@ gambia: &gambia stream: gambia branch: 'stable/{stream}' - disabled: false + disabled: true gs-pathname: '/{stream}' functest_docker_tag: '{stream}' # ------------------------------- diff --git a/jjb/fuel/fuel-docker-jobs.yaml b/jjb/fuel/fuel-docker-jobs.yaml index ae80c440e..20e958103 100644 --- a/jjb/fuel/fuel-docker-jobs.yaml +++ b/jjb/fuel/fuel-docker-jobs.yaml @@ -14,7 +14,7 @@ disabled: false - gambia: branch: 'stable/{stream}' - disabled: false + disabled: true arch_tag: - 'amd64': diff --git a/jjb/fuel/fuel-rtd-jobs.yaml b/jjb/fuel/fuel-rtd-jobs.yaml index d40ef984f..7f42c0771 100644 --- a/jjb/fuel/fuel-rtd-jobs.yaml +++ b/jjb/fuel/fuel-rtd-jobs.yaml @@ -14,7 +14,7 @@ disabled: false - gambia: branch: 'stable/{stream}' - disabled: false + disabled: true jobs: - '{project-name}-rtd-jobs' diff --git a/jjb/fuel/fuel-verify-jobs.yaml b/jjb/fuel/fuel-verify-jobs.yaml index d31823770..4678e4fa1 100644 --- a/jjb/fuel/fuel-verify-jobs.yaml +++ b/jjb/fuel/fuel-verify-jobs.yaml @@ -17,7 +17,7 @@ - gambia: branch: 'stable/{stream}' gs-pathname: '/{stream}' - disabled: false + disabled: true functest_docker_tag: '{stream}' ##################################### # cluster architectures diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index 91ca5eb88..52f65ba7e 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -55,13 +55,13 @@ run_test() { cmd_opt="run_tests -t ${test_name}" # Determine which Functest image should be used for the test case case ${test_name} in - connection_check|tenantnetwork1|tenantnetwork2|vmready1|vmready2|singlevm1|singlevm2|vping_ssh|vping_userdata|cinder_test|odl|api_check|snaps_health_check) + connection_check|tenantnetwork1|tenantnetwork2|vmready1|vmready2|singlevm1|singlevm2|vping_ssh|vping_userdata|cinder_test|odl|api_check|snaps_health_check|tempest_smoke) FUNCTEST_IMAGE=${REPO}/functest-healthcheck:${DOCKER_TAG} ;; - tempest_smoke_serial|tempest_smoke|neutron-tempest-plugin-api|rally_sanity|refstack_defcore|patrole|snaps_smoke|neutron_trunk|networking-bgpvpn|networking-sfc|barbican) + neutron-tempest-plugin-api|rally_sanity|refstack_defcore|tempest_full|tempest_scenario|patrole|snaps_smoke|neutron_trunk|networking-bgpvpn|networking-sfc|barbican) FUNCTEST_IMAGE=${REPO}/functest-smoke:${DOCKER_TAG} ;; - shaker|vmtp) + rally_jobs|shaker|vmtp) FUNCTEST_IMAGE=${REPO}/functest-benchmarking:${DOCKER_TAG} ;; - tempest_full_parallel|tempest_full|tempest_scenario|rally_full) + rally_full) FUNCTEST_IMAGE=${REPO}/functest-components:${DOCKER_TAG} ;; cloudify|cloudify_ims|heat_ims|vyos_vrouter|juju_epc) FUNCTEST_IMAGE=${REPO}/functest-vnf:${DOCKER_TAG} ;; @@ -85,6 +85,7 @@ run_test() { [[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null" +redirect="/dev/stdout" FUNCTEST_DIR=/home/opnfv/functest DEPLOY_TYPE=baremetal [[ $BUILD_TAG =~ "virtual" ]] && DEPLOY_TYPE=virt @@ -107,12 +108,11 @@ rc_file_vol="-v ${rc_file}:${FUNCTEST_DIR}/conf/env_file" echo "Functest: Start Docker and prepare environment" echo "Functest: Download images that will be used by test cases" +env +pwd +ls -l images_dir="${HOME}/opnfv/functest/images" download_script=${WORKSPACE}/functest/ci/download_images.sh -if [[ ! -f ${download_script} ]]; then - # to support Danube as well - wget https://git.opnfv.org/functest/plain/functest/ci/download_images.sh -O ${download_script} 2> ${redirect} -fi chmod +x ${download_script} ${download_script} ${images_dir} ${DEPLOY_SCENARIO} ${HOST_ARCH} 2> ${redirect} @@ -267,21 +267,21 @@ elif [ ${FUNCTEST_MODE} == 'tier' ]; then tiers=(${FUNCTEST_TIER}) run_tiers ${tiers} else - tests=(tempest_full tempest_scenario) + tests=() skip_tests=0 if [ ${DEPLOY_TYPE} == 'baremetal' ] && [ "${HOST_ARCH}" != "aarch64" ]; then if [[ ${BRANCH} == "stable/fraser" ]]; then tiers=(healthcheck smoke features vnf parser) tests=(tempest_full_parallel) else - tiers=(healthcheck smoke benchmarking features vnf) + tiers=(healthcheck smoke benchmarking features vnf components) fi else if [[ ${BRANCH} == "stable/fraser" ]]; then tiers=(healthcheck smoke features parser) tests=(tempest_full_parallel) else - tiers=(healthcheck smoke benchmarking features) + tiers=(healthcheck smoke benchmarking features components) fi fi run_tiers ${tiers} diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml index 19967e9fd..03ef43629 100644 --- a/jjb/functest/functest-docker.yaml +++ b/jjb/functest/functest-docker.yaml @@ -42,6 +42,8 @@ exclude: - stream: 'master' + image: 'components' + - stream: 'master' image: 'parser' - stream: 'hunter' image: 'parser' diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml index d24ee120b..2433594b3 100644 --- a/jjb/functest/functest.yaml +++ b/jjb/functest/functest.yaml @@ -10,6 +10,8 @@ tag: - latest: branch: master + - hunter: + branch: stable/hunter - parameter: name: functest-slave @@ -255,6 +257,7 @@ - odl - api_check - snaps_health_check + - tempest_smoke jobs: - 'functest-{repo}-{container}-{tag}-{test}-run' @@ -263,11 +266,11 @@ <<: *functest-params container: 'functest-smoke' test: - - tempest_smoke - neutron-tempest-plugin-api - rally_sanity - - rally_jobs - refstack_defcore + - tempest_full + - tempest_scenario - patrole - snaps_smoke - neutron_trunk @@ -282,6 +285,7 @@ <<: *functest-params container: 'functest-benchmarking' test: + - rally_jobs - vmtp - shaker jobs: @@ -292,8 +296,6 @@ <<: *functest-params container: 'functest-components' test: - - tempest_full - - tempest_scenario - rally_full jobs: - 'functest-{repo}-{container}-{tag}-{test}-run' @@ -398,19 +400,21 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-healthcheck-{tag}-snaps_health_check-run' <<: *functest-jobs + - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run' + <<: *functest-jobs - multijob: name: opnfv/functest-smoke:{tag} projects: - - name: 'functest-opnfv-functest-smoke-{tag}-tempest_smoke-run' - <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-{tag}-rally_jobs-run' - <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run' <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-tempest_full-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-tempest_scenario-run' + <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-snaps_smoke-run' @@ -426,6 +430,8 @@ - multijob: name: opnfv/functest-benchmarking:{tag} projects: + - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_jobs-run' + <<: *functest-jobs - name: 'functest-opnfv-functest-benchmarking-{tag}-vmtp-run' <<: *functest-jobs - name: 'functest-opnfv-functest-benchmarking-{tag}-shaker-run' @@ -433,10 +439,6 @@ - multijob: name: opnfv/functest-components:{tag} projects: - - name: 'functest-opnfv-functest-components-{tag}-tempest_full-run' - <<: *functest-jobs - - name: 'functest-opnfv-functest-components-{tag}-tempest_scenario-run' - <<: *functest-jobs - name: 'functest-opnfv-functest-components-{tag}-rally_full-run' <<: *functest-jobs - multijob: @@ -685,19 +687,21 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-healthcheck-{tag}-snaps_health_check-run' <<: *functest-jobs + - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run' + <<: *functest-jobs - multijob: name: opnfv/functest-smoke:{tag} projects: - - name: 'functest-opnfv-functest-smoke-{tag}-tempest_smoke-run' - <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-{tag}-rally_jobs-run' - <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run' <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-tempest_full-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-tempest_scenario-run' + <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-snaps_smoke-run' @@ -713,6 +717,8 @@ - multijob: name: opnfv/functest-benchmarking:{tag} projects: + - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_jobs-run' + <<: *functest-jobs - name: 'functest-opnfv-functest-benchmarking-{tag}-vmtp-run' <<: *functest-jobs - name: 'functest-opnfv-functest-benchmarking-{tag}-shaker-run' @@ -720,10 +726,6 @@ - multijob: name: opnfv/functest-components:{tag} projects: - - name: 'functest-opnfv-functest-components-{tag}-tempest_full-run' - <<: *functest-jobs - - name: 'functest-opnfv-functest-components-{tag}-tempest_scenario-run' - <<: *functest-jobs - name: 'functest-opnfv-functest-components-{tag}-rally_full-run' <<: *functest-jobs - multijob: @@ -872,19 +874,21 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-healthcheck-{tag}-snaps_health_check-run' <<: *functest-jobs + - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run' + <<: *functest-jobs - multijob: name: opnfv/functest-smoke:{tag} projects: - - name: 'functest-opnfv-functest-smoke-{tag}-tempest_smoke-run' - <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-{tag}-rally_jobs-run' - <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run' <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-tempest_full-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-tempest_scenario-run' + <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-snaps_smoke-run' @@ -900,6 +904,8 @@ - multijob: name: opnfv/functest-benchmarking:{tag} projects: + - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_jobs-run' + <<: *functest-jobs - name: 'functest-opnfv-functest-benchmarking-{tag}-vmtp-run' <<: *functest-jobs - name: 'functest-opnfv-functest-benchmarking-{tag}-shaker-run' @@ -907,10 +913,6 @@ - multijob: name: opnfv/functest-components:{tag} projects: - - name: 'functest-opnfv-functest-components-{tag}-tempest_full-run' - <<: *functest-jobs - - name: 'functest-opnfv-functest-components-{tag}-tempest_scenario-run' - <<: *functest-jobs - name: 'functest-opnfv-functest-components-{tag}-rally_full-run' <<: *functest-jobs - multijob: diff --git a/jjb/opnfvdocs/project.cfg b/jjb/opnfvdocs/project.cfg deleted file mode 100644 index d5ef6e6f7..000000000 --- a/jjb/opnfvdocs/project.cfg +++ /dev/null @@ -1,41 +0,0 @@ -apex -armband -availability -bottlenecks -clover -compass4nfv -conductor -container4nfv -daisy -doctor -domino -dovetail -dpacc -escalator -fastpathmetrics -fuel -functest -genesisreq -ipv6 -joid -kvmfornfv -lsoapi -moon -movie -multisite -octopus -onosfw -ovno -ovsnfv -parser -pharos -policytest -prediction -promise -qtip -sdnvpn -sfc -storperf -vnf_forwarding_graph -vswitchperf -yardstick diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml index c41b25253..591452a74 100644 --- a/jjb/releng/opnfv-docker.yaml +++ b/jjb/releng/opnfv-docker.yaml @@ -61,6 +61,12 @@ dockerdir: 'docker/barometer-collectd' <<: *master <<: *other-receivers + - 'barometer-collectd-master': + project: 'barometer' + dockerdir: '.' + dockerfile: 'docker/barometer-collectd-master/Dockerfile' + <<: *master + <<: *other-receivers - 'barometer-dma': project: 'barometer' dockerdir: 'docker/barometer-dma' @@ -280,6 +286,12 @@ dockerdir: 'docker/barometer-collectd' <<: *gambia <<: *other-receivers + - 'barometer-collectd-master': + project: 'barometer' + dockerdir: '.' + dockerfile: 'docker/barometer-collectd-master/Dockerfile' + <<: *gambia + <<: *other-receivers - 'barometer-grafana': project: 'barometer' dockerdir: 'docker/barometer-grafana' @@ -409,9 +421,6 @@ - 'daisy': dockerrepo: 'daisy' <<: *master - - 'escalator': - dockerrepo: 'escalator' - <<: *master jobs: - '{project}-docker-build-push-monitor-{stream}' diff --git a/jjb/vnf_forwarding_graph/vnf-forwarding-graph-rtd-jobs.yaml b/jjb/vnf_forwarding_graph/vnf-forwarding-graph-rtd-jobs.yaml deleted file mode 100644 index 69895d101..000000000 --- a/jjb/vnf_forwarding_graph/vnf-forwarding-graph-rtd-jobs.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -- project: - name: vnf-forwarding-graph-rtd - project: vnf-forwarding-graph - project-name: vnf-forwarding-graph - - gerrit-skip-vote: true - project-pattern: 'vnf-forwarding-graph' - rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-vnf-forwarding-graph/47397/' - rtd-token: '5c6fd3d0f49fb88ea4230d6666d94b59fef86e7f' - - jobs: - - '{project-name}-rtd-jobs' diff --git a/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yaml b/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yaml deleted file mode 100644 index b11c20f62..000000000 --- a/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- project: - name: vnf_forwarding_graph - - project: '{name}' - - jobs: - - '{project}-verify-basic' diff --git a/releases/gambia/armband.yaml b/releases/gambia/armband.yaml index a523d5a40..b0f11db02 100644 --- a/releases/gambia/armband.yaml +++ b/releases/gambia/armband.yaml @@ -18,6 +18,9 @@ releases: - version: opnfv-7.1.0 location: armband: 5d8dd94fd0a50d9899010eb764e94abcb05b38c7 + - version: opnfv-7.2.0 + location: + armband: 5d8dd94fd0a50d9899010eb764e94abcb05b38c7 branches: - name: stable/gambia diff --git a/releases/gambia/fuel.yaml b/releases/gambia/fuel.yaml index 3a60effb8..f74f25df8 100644 --- a/releases/gambia/fuel.yaml +++ b/releases/gambia/fuel.yaml @@ -23,5 +23,8 @@ releases: - version: opnfv-7.1.0 location: fuel: 79c56150533ec77e73bede445e74960affbbef67 + - version: opnfv-7.2.0 + location: + fuel: 0c05f52aaf024db6443336f69ebc7c6e037d06b9 release-notes: https://opnfv-fuel.readthedocs.io/en/latest/release/release-notes/release-notes.html diff --git a/utils/push-test-logs.sh b/utils/push-test-logs.sh index 63a1ecc0d..3a8b71856 100644 --- a/utils/push-test-logs.sh +++ b/utils/push-test-logs.sh @@ -27,7 +27,7 @@ node_list=(\ 'ericsson-pod1' 'ericsson-pod2' \ 'ericsson-virtual1' 'ericsson-virtual2' 'ericsson-virtual3' \ 'ericsson-virtual4' 'ericsson-virtual5' \ -'arm-pod5' 'arm-pod6' 'arm-pod9' 'arm-pod10' \ +'arm-pod9' 'arm-pod10' \ 'huawei-pod1' 'huawei-pod2' 'huawei-pod3' 'huawei-pod4' \ 'huawei-pod6' 'huawei-pod7' 'huawei-pod12' 'huawei-pod8' \ 'huawei-virtual1' 'huawei-virtual2' 'huawei-virtual3' 'huawei-virtual4' \ |