From: Aric Gardner Date: Thu, 3 Oct 2019 18:35:10 +0000 (-0400) Subject: Remove all compass jobs X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=releng.git;a=commitdiff_plain;h=824a278e82c9bc5217d6f7c3d99511eb23334f70 Remove all compass jobs Remove all jobs associated or dependant on compass Signed-off-by: Aric Gardner Change-Id: I2bdac50e535736e51d815fc12c4141158f1ef852 --- diff --git a/jjb/bottlenecks/bottlenecks-ci-jobs.yaml b/jjb/bottlenecks/bottlenecks-ci-jobs.yaml deleted file mode 100644 index 0a48eedf5..000000000 --- a/jjb/bottlenecks/bottlenecks-ci-jobs.yaml +++ /dev/null @@ -1,205 +0,0 @@ ---- -#################################### -# job configuration for bottlenecks -#################################### -- project: - name: bottlenecks-ci-jobs - - project: 'bottlenecks' - - # ------------------------------- - # BRANCH ANCHORS - # ------------------------------- - master: &master - stream: master - branch: '{stream}' - # This is used for common project file storage - gs-pathname: '' - # This is used for different test suite dependent packages storage - gs-packagepath: '/{suite}' - # docker tag used for version control - docker-tag: 'latest' - gambia: &gambia - stream: gambia - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - gs-packagepath: '/{stream}/{suite}' - docker-tag: 'stable' - # ------------------------------- - # POD, INSTALLER, AND BRANCH MAPPING - # ------------------------------- - # Installers using labels - # CI PODs - # This section should only contain the installers - # that have been switched using labels for slaves - # ------------------------------- - pod: - # compass CI PODs - - baremetal: - slave-label: compass-baremetal-master - installer: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *master - - virtual: - slave-label: compass-virtual-master - installer: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *master - - baremetal: - slave-label: compass-baremetal-branch - installer: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *gambia - - virtual: - slave-label: compass-virtual-branch - installer: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *gambia - - # ------------------------------- - # None-CI PODs - # ------------------------------- - # - orange-pod2: - # slave-label: '{pod}' - # installer: joid - # auto-trigger-name: 'daily-trigger-disabled' - # <<: *fraser - # - orange-pod2: - # slave-label: '{pod}' - # installer: joid - # auto-trigger-name: 'daily-trigger-disabled' - # <<: *master - # ------------------------------------------- - suite: - - 'posca_stress_traffic' - - 'posca_stress_ping' - - 'posca_factor_multistack_storage' - - 'posca_factor_multistack_storage_parallel' - - 'posca_feature_moon_resources' - - 'posca_feature_moon_tenants' - - 'posca_feature_vnf_scale_out' - - 'posca_factor_soak_throughputs' - - 'kubestone_deployment_capacity' - - jobs: - - 'bottlenecks-{installer}-{suite}-{pod}-daily-{stream}' - -################################ -# job templates -################################ -- job-template: - name: 'bottlenecks-{installer}-{suite}-{pod}-daily-{stream}' - - wrappers: - - build-name: - name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' - - timeout: - timeout: 180 - abort: true - - fix-workspace-permissions - - triggers: - - '{auto-trigger-name}' - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - '{slave-label}-defaults' - - '{installer}-defaults' - - 'bottlenecks-params-{slave-label}' - - string: - name: REPO_DIR - default: "/home/opnfv/bottlenecks" - description: "Directory where the repository is cloned" - - string: - name: DEPLOY_SCENARIO - default: 'os-odl_l2-nofeature-ha' - - string: - name: GERRIT_REFSPEC_DEBUG - default: 'true' - description: "Gerrit refspec for debug." - - string: - name: SUITE_NAME - default: '{suite}' - description: "test suite name." - - string: - name: DOCKER_TAG - default: '{docker-tag}' - description: "docker image tag used for version control" - - scm: - - git-scm - - builders: - - 'bottlenecks-env-cleanup' - - 'bottlenecks-run-suite' - - 'bottlenecks-workspace-cleanup' - - publishers: - - email: - recipients: gabriel.yuyang@huawei.com, liyin11@huawei.com - - email-jenkins-admins-on-failure - -######################## -# builder macros -######################## -- builder: - name: bottlenecks-env-cleanup - builders: - - shell: - !include-raw: ./bottlenecks-cleanup.sh - -- builder: - name: bottlenecks-run-suite - builders: - - shell: - !include-raw: ./bottlenecks-run-suite.sh - -- builder: - name: bottlenecks-workspace-cleanup - builders: - - shell: | - #!/bin/bash - set -o errexit - set -o nounset - set -o pipefail - - # delete everything that is in $WORKSPACE - sudo rm -rf $WORKSPACE - -#################### -# parameter macros -#################### - -- parameter: - name: 'bottlenecks-params-compass-baremetal-master' - parameters: - - string: - name: BOTTLENECKS_DB_TARGET - default: 'http://testresults.opnfv.org/test/api/v1/results' - description: 'Arguments to use in order to choose the backend DB' - -- parameter: - name: 'bottlenecks-params-compass-virtual-master' - parameters: - - string: - name: BOTTLENECKS_DB_TARGET - default: 'http://testresults.opnfv.org/test/api/v1/results' - description: 'Arguments to use in order to choose the backend DB' - -- parameter: - name: 'bottlenecks-params-compass-baremetal-branch' - parameters: - - string: - name: BOTTLENECKS_DB_TARGET - default: 'http://testresults.opnfv.org/test/api/v1/results' - description: 'Arguments to use in order to choose the backend DB' - -- parameter: - name: 'bottlenecks-params-compass-virtual-branch' - parameters: - - string: - name: BOTTLENECKS_DB_TARGET - default: 'http://testresults.opnfv.org/test/api/v1/results' - description: 'Arguments to use in order to choose the backend DB' diff --git a/jjb/bottlenecks/bottlenecks-run-suite.sh b/jjb/bottlenecks/bottlenecks-run-suite.sh index 9b5e8eecf..2c044eaa7 100644 --- a/jjb/bottlenecks/bottlenecks-run-suite.sh +++ b/jjb/bottlenecks/bottlenecks-run-suite.sh @@ -48,24 +48,8 @@ if [[ $SUITE_NAME == *posca* ]]; then POSCA_SCRIPT=/home/opnfv/bottlenecks/testsuites/posca sudo rm -f ${OPENRC} - # Preparing OpenStack RC and Cacert files - echo "BOTTLENECKS INFO: fetching os credentials from $INSTALLER_TYPE" - if [[ $INSTALLER_TYPE == 'compass' ]]; then - ${RELENG_REPO}/utils/fetch_os_creds.sh -d ${OPENRC} -i ${INSTALLER_TYPE} -a ${INSTALLER_IP} -o ${OS_CACERT} >${redirect} - if [[ -f ${OS_CACERT} ]]; then - echo "BOTTLENECKS INFO: successfully fetching os_cacert for openstack: ${OS_CACERT}" - else - echo "BOTTLENECKS ERROR: couldn't find os_cacert file: ${OS_CACERT}, please check if the it's been properly provided." - exit 1 - fi - fi - if [[ -f ${OPENRC} ]]; then echo "BOTTLENECKS INFO: openstack credentials path is ${OPENRC}" - if [[ $INSTALLER_TYPE == 'compass' ]]; then - echo "BOTTLENECKS INFO: writing ${OS_CACERT} to ${OPENRC}" - echo "export OS_CACERT=${OS_CACERT}" >> ${OPENRC} - fi cat ${OPENRC} else echo "BOTTLENECKS ERROR: couldn't find openstack rc file: ${OPENRC}, please check if the it's been properly provided." @@ -95,9 +79,7 @@ if [[ $SUITE_NAME == *posca* ]]; then sudo -H pip install -e ./ >/dev/null sudo -H pip install netaddr - if [[ ${INSTALLER_TYPE} == compass ]]; then - options="-u root -p root" - elif [[ ${INSTALLER_TYPE} == fuel ]]; then + if [[ ${INSTALLER_TYPE} == fuel ]]; then options="-u root -p r00tme" elif [[ ${INSTALLER_TYPE} == apex ]]; then options="-u stack -k /root/.ssh/id_rsa" @@ -105,19 +87,6 @@ if [[ $SUITE_NAME == *posca* ]]; then echo "Don't support to generate pod.yaml on ${INSTALLER_TYPE} currently." fi - if [[ ${INSTALLER_TYPE} != compass ]]; then - cmd="sudo python ${RELENG_REPO}/utils/create_pod_file.py -t ${INSTALLER_TYPE} \ - -i ${INSTALLER_IP} ${options} -f ${BOTTLENECKS_CONFIG}/pod.yaml \ - -s ${BOTTLENECKS_CONFIG}/id_rsa" - echo ${cmd} - ${cmd} - else - cmd="sudo cp ${YARDSTICK_REPO}/etc/yardstick/nodes/compass_sclab_virtual/pod.yaml \ - ${BOTTLENECKS_CONFIG}" - echo ${cmd} - ${cmd} - fi - deactivate sudo rm -rf ${RELENG_REPO}/modules/venv diff --git a/jjb/ci_gate_security/opnfv-ci-gate-security.yaml b/jjb/ci_gate_security/opnfv-ci-gate-security.yaml index ff0ade3dd..45e6db5a0 100644 --- a/jjb/ci_gate_security/opnfv-ci-gate-security.yaml +++ b/jjb/ci_gate_security/opnfv-ci-gate-security.yaml @@ -22,8 +22,6 @@ - bottlenecks - calipso - clover - - compass-containers - - compass4nfv - conductor - container4nfv - cperf @@ -152,7 +150,7 @@ comment-contains-value: 'recheck' projects: - project-compare-type: 'REG_EXP' - project-pattern: 'apex|armband|bamboo|barometer|bottlenecks|calipso|compass4nfv|conductor|cperf|daisy|doctor|dovetail|dpacc|enfv|fds|fuel|pharos|releng|sandbox|yardstick|infra|ipv6|kvmfornfv|models|moon' + project-pattern: 'apex|armband|bamboo|barometer|bottlenecks|calipso|conductor|cperf|daisy|doctor|dovetail|dpacc|enfv|fds|fuel|pharos|releng|sandbox|yardstick|infra|ipv6|kvmfornfv|models|moon' branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' diff --git a/jjb/compass4nfv/compass-build.sh b/jjb/compass4nfv/compass-build.sh deleted file mode 100644 index 673a9f106..000000000 --- a/jjb/compass4nfv/compass-build.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash -set -o errexit -set -o nounset -set -o pipefail -set -x - -# log info to console -echo "Starting the build of $INSTALLER_TYPE. This could take some time..." -echo "--------------------------------------------------------" -echo - -# create the cache directory if it doesn't exist -[[ -d $CACHE_DIRECTORY ]] || mkdir -p $CACHE_DIRECTORY -[[ -d $BUILD_DIRECTORY ]] || mkdir -p $BUILD_DIRECTORY - -# set OPNFV_ARTIFACT_VERSION -export OPNFV_ARTIFACT_VERSION=$(date -u +"%Y-%m-%d_%H-%M-%S") -export PACKAGE_URL=$PPA_REPO - -# start the build -if [ -d $PPA_CACHE ] -then - cp $PPA_CACHE/*.tar.gz $PPA_CACHE/*.iso $PPA_CACHE/*.img $CACHE_DIRECTORY/ -f -fi - -cd $WORKSPACE/ - -if [[ "$BRANCH" == 'stable/danube' ]]; then - ./build.sh --iso-dir $BUILD_DIRECTORY/ --iso-name compass.iso -c $CACHE_DIRECTORY - OPNFV_ARTIFACT_SHA512SUM=$(sha512sum $BUILD_DIRECTORY/compass.iso | cut -d' ' -f1) - OPNFV_ARTIFACT_URL=$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso -else - ./build.sh --tar-dir $BUILD_DIRECTORY/ --tar-name compass.tar.gz -c $CACHE_DIRECTORY - OPNFV_ARTIFACT_SHA512SUM=$(sha512sum $BUILD_DIRECTORY/compass.tar.gz | cut -d' ' -f1) - OPNFV_ARTIFACT_URL=$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.tar.gz -fi - -# list the build artifacts -ls -al $BUILD_DIRECTORY - -# 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=$OPNFV_ARTIFACT_URL" - echo "OPNFV_ARTIFACT_SHA512SUM=$OPNFV_ARTIFACT_SHA512SUM" - echo "OPNFV_BUILD_URL=$BUILD_URL" -) > $BUILD_DIRECTORY/opnfv.properties -echo -echo "--------------------------------------------------------" -echo "Done!" diff --git a/jjb/compass4nfv/compass-ci-jobs.yaml b/jjb/compass4nfv/compass-ci-jobs.yaml deleted file mode 100644 index cda7399ca..000000000 --- a/jjb/compass4nfv/compass-ci-jobs.yaml +++ /dev/null @@ -1,1059 +0,0 @@ ---- -- project: - - name: compass-ci - - installer: 'compass' - - project: 'compass4nfv' - - master: &master - stream: master - branch: '{stream}' - gs-pathname: '' - ppa-pathname: '/{stream}' - disabled: false - openstack-version: queens - gambia: &gambia - stream: gambia - branch: 'stable/{stream}' - disabled: false - gs-pathname: '/{stream}' - ppa-pathname: '/{stream}' - openstack-version: queens - danube: &danube - stream: danube - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - ppa-pathname: '/{stream}' - disabled: false - openstack-version: newton - # ------------------------------- - # POD, INSTALLER, AND BRANCH MAPPING - # ------------------------------- - # CI PODs - # ------------------------------- - pod: - - baremetal: - slave-label: compass-baremetal-master - os-version: 'xenial' - <<: *master - - virtual: - slave-label: compass-virtual-master - os-version: 'xenial' - <<: *master - - baremetal: - slave-label: compass-baremetal-branch - os-version: 'xenial' - <<: *gambia - - virtual: - slave-label: compass-virtual-branch - os-version: 'xenial' - <<: *gambia - # ------------------------------- - # master - # ------------------------------- - - baremetal-centos: - slave-label: compass-baremetal-master - os-version: 'centos7' - <<: *master - # ------------------------------- - # danube for dovetail - # ------------------------------- - - huawei-pod7: - slave-label: 'huawei-pod7' - os-version: 'xenial' - <<: *danube - - scenario: - - 'os-nosdn-nofeature-ha': - disabled: false - auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' - - 'os-odl_l3-nofeature-ha': - disabled: false - auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' - - 'os-onos-nofeature-ha': - disabled: false - auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' - - 'os-ocl-nofeature-ha': - disabled: false - auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' - - 'os-onos-sfc-ha': - disabled: false - auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' - - 'os-odl_l2-moon-ha': - disabled: false - auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' - - 'os-nosdn-kvm-ha': - disabled: false - auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' - - 'os-nosdn-openo-ha': - disabled: false - auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' - - 'os-odl-sfc-ha': - disabled: false - auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' - - 'os-nosdn-ovs_dpdk-ha': - disabled: false - auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' - - 'k8-nosdn-nofeature-ha': - disabled: false - auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' - - 'os-nosdn-nofeature-noha': - disabled: false - auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' - - 'os-odl_l3-nofeature-noha': - disabled: false - auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' - - 'os-odl_l2-moon-noha': - disabled: false - auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' - - 'os-nosdn-kvm-noha': - disabled: false - auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' - - 'os-odl-sfc-noha': - disabled: false - auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' - - 'os-nosdn-ovs_dpdk-noha': - disabled: false - auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' - - 'os-nosdn-bar-ha': - disabled: false - auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' - - 'os-nosdn-bar-noha': - disabled: false - auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' - - 'k8-nosdn-stor4nfv-ha': - disabled: false - auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' - - 'k8-nosdn-stor4nfv-noha': - disabled: false - auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' - - 'os-nosdn-stor4nfv-ha': - disabled: false - auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' - - jobs: - - 'compass-{scenario}-{pod}-daily-{stream}' - - 'compass-deploy-{pod}-daily-{stream}' - - 'compass-collect-logs-{pod}-daily-{stream}' - -######################## -# job templates -######################## -- job-template: - name: 'compass-{scenario}-{pod}-daily-{stream}' - - disabled: '{obj:disabled}' - - concurrent: true - - properties: - - logrotate-default - - throttle: - enabled: true - max-per-node: 1 - option: 'project' - - build-blocker: - use-build-blocker: true - blocking-jobs: - - 'compass-os-.*?-{pod}-daily-.*?' - - 'compass-k8-.*?-{pod}-daily-.*?' - - 'compass-os-.*?-baremetal-daily-.*?' - - 'compass-k8-.*?-baremetal-daily-.*?' - - 'compass-verify-[^-]*-[^-]*' - blocking-level: 'NODE' - - wrappers: - - fix-workspace-permissions - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - compass-ci-parameter: - installer: '{installer}' - gs-pathname: '{gs-pathname}' - ppa-pathname: '{ppa-pathname}' - - '{slave-label}-defaults' - - '{installer}-defaults' - - triggers: - - '{auto-trigger-name}' - - builders: - - description-setter: - description: "POD: $NODE_NAME" - - trigger-builds: - - project: 'compass-deploy-{pod}-daily-{stream}' - current-parameters: true - predefined-parameters: | - DEPLOY_SCENARIO={scenario} - COMPASS_OS_VERSION={os-version} - COMPASS_OPENSTACK_VERSION={openstack-version} - same-node: true - block: true - - trigger-builds: - - project: 'functest-compass-{pod}-daily-{stream}' - current-parameters: false - predefined-parameters: - DEPLOY_SCENARIO={scenario} - same-node: true - block: true - block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'FAILURE' - - trigger-builds: - - project: 'yardstick-compass-{pod}-daily-{stream}' - current-parameters: false - predefined-parameters: - DEPLOY_SCENARIO={scenario} - block: true - same-node: true - block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'FAILURE' - # here the stream means the SUT stream, dovetail stream is defined in its own job - # only run on os-(nosdn|odl_l3)-nofeature-ha scenario - # run with testsuite default, testarea mandatory, dovetail docker image with latest tag - # run with testsuite default, testarea optional, dovetail docker image with latest tag - # run with testsuite proposed_tests, testarea optional, dovetail docker image with latest tag - - conditional-step: - condition-kind: and - condition-operands: - - condition-kind: regex-match - regex: os-(nosdn|odl_l3)-nofeature-ha - label: '{scenario}' - steps: - - trigger-builds: - - project: 'dovetail-compass-{pod}-default-mandatory-{stream}' - current-parameters: false - predefined-parameters: | - DOCKER_TAG=latest - DEPLOY_SCENARIO={scenario} - block: true - same-node: true - block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'FAILURE' - - project: 'dovetail-compass-{pod}-default-optional-{stream}' - current-parameters: false - predefined-parameters: | - DOCKER_TAG=latest - DEPLOY_SCENARIO={scenario} - block: true - same-node: true - block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'FAILURE' - - project: 'dovetail-compass-{pod}-proposed_tests-optional-{stream}' - current-parameters: false - predefined-parameters: | - DOCKER_TAG=latest - DEPLOY_SCENARIO={scenario} - block: true - same-node: true - block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'FAILURE' - - conditional-step: - condition-kind: and - condition-operands: - - condition-kind: regex-match - regex: os-nosdn-nofeature-ha - label: '{scenario}' - steps: - - trigger-builds: - - project: 'bottlenecks-compass-posca_factor_multistack_storage_parallel-{pod}-daily-{stream}' - current-parameters: false - predefined-parameters: - DEPLOY_SCENARIO={scenario} - block: true - same-node: true - block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'FAILURE' - - project: 'bottlenecks-compass-posca_factor_soak_throughputs-{pod}-daily-{stream}' - current-parameters: false - predefined-parameters: - DEPLOY_SCENARIO={scenario} - block: true - same-node: true - block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'FAILURE' - - project: 'bottlenecks-compass-posca_stress_ping-{pod}-daily-{stream}' - current-parameters: false - predefined-parameters: - DEPLOY_SCENARIO={scenario} - block: true - same-node: true - block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'FAILURE' - - conditional-step: - condition-kind: and - condition-operands: - - condition-kind: regex-match - regex: k8-nosdn-nofeature-ha - label: '{scenario}' - steps: - - trigger-builds: - - project: 'bottlenecks-compass-kubestone_deployment_capacity-{pod}-daily-{stream}' - current-parameters: false - predefined-parameters: - DEPLOY_SCENARIO={scenario} - block: true - same-node: true - block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'FAILURE' - - conditional-step: - condition-kind: and - condition-operands: - - condition-kind: regex-match - regex: master - label: '{stream}' - steps: - - trigger-builds: - - project: 'compass-collect-logs-{pod}-daily-{stream}' - current-parameters: false - predefined-parameters: - DEPLOY_SCENARIO={scenario} - block: true - same-node: true - block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'FAILURE' - - -- job-template: - name: 'compass-deploy-{pod}-daily-{stream}' - - disabled: false - - concurrent: true - - properties: - - logrotate-default - - throttle: - enabled: true - max-per-node: 1 - option: 'project' - - build-blocker: - use-build-blocker: true - blocking-jobs: - - 'compass-deploy-{pod}-daily-.*?' - - 'compass-verify-deploy-.*?' - blocking-level: 'NODE' - - wrappers: - - build-name: - name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' - - timeout: - timeout: 360 - abort: true - - fix-workspace-permissions - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - compass-ci-parameter: - installer: '{installer}' - gs-pathname: '{gs-pathname}' - ppa-pathname: '{ppa-pathname}' - - '{slave-label}-defaults' - - '{installer}-defaults' - - scm: - - git-scm - - builders: - - description-setter: - description: "POD: $NODE_NAME" - - conditional-step: - condition-kind: regex-match - regex: master - label: '{stream}' - steps: - - shell: - !include-raw-escape: ./compass-build.sh - - shell: - !include-raw-escape: ./compass-deploy.sh - - conditional-step: - condition-kind: regex-match - regex: (danube|gambia) - label: '{stream}' - steps: - - shell: - !include-raw-escape: ./compass-download-artifact.sh - - shell: - !include-raw-escape: ./compass-deploy.sh - -- job-template: - name: 'compass-collect-logs-{pod}-daily-{stream}' - - disabled: '{obj:disabled}' - - concurrent: true - - properties: - - logrotate-default - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - compass-ci-parameter: - installer: '{installer}' - gs-pathname: '{gs-pathname}' - ppa-pathname: '{ppa-pathname}' - - '{slave-label}-defaults' - - '{installer}-defaults' - - - scm: - - git-scm - - wrappers: - - build-name: - name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' - - fix-workspace-permissions - - builders: - - description-setter: - description: "Built on $NODE_NAME" - - shell: - !include-raw-escape: ./compass-logs.sh - -######################## -# parameter macros -######################## -- parameter: - name: compass-ci-parameter - 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: GS_URL - default: '$GS_BASE{gs-pathname}' - description: "URL to Google Storage." - - string: - name: CACHE_DIRECTORY - default: "$HOME/opnfv/cache/$PROJECT{gs-pathname}" - description: "Directory where the cache to be used during the build is located." - - string: - name: PPA_REPO - default: "https://artifacts.opnfv.org/compass4nfv/package{ppa-pathname}" - - string: - name: PPA_CACHE - default: "$WORKSPACE/work/repo/" - - string: - name: LOG_DIRECTORY - default: $WORKSPACE/log_output - description: "Directory where the logs will be located upon the completion of the collection." - - string: - name: DEPLOY_SCENARIO - default: 'os-nosdn-nofeature-ha' - description: "Scenario to deploy with." - - string: - name: COMPASS_OS_VERSION - default: '' - - string: - name: COMPASS_OPENSTACK_VERSION - default: '' - - -######################## -# trigger macros -######################## - -# -------------------------- -# ha-baremetal-centos-master -# -------------------------- -- trigger: - name: 'compass-os-nosdn-nofeature-ha-baremetal-centos-master-trigger' - triggers: - - timed: '0 19 * * *' -- trigger: - name: 'compass-os-nosdn-openo-ha-baremetal-centos-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-odl_l3-nofeature-ha-baremetal-centos-master-trigger' - triggers: - - timed: '0 15 * * *' -- trigger: - name: 'compass-os-onos-nofeature-ha-baremetal-centos-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-ocl-nofeature-ha-baremetal-centos-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-onos-sfc-ha-baremetal-centos-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-odl_l2-moon-ha-baremetal-centos-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-nosdn-kvm-ha-baremetal-centos-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-centos-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-odl-sfc-ha-baremetal-centos-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-k8-nosdn-nofeature-ha-baremetal-centos-master-trigger' - triggers: - - timed: '0 6 * * *' -- trigger: - name: 'compass-os-nosdn-bar-ha-baremetal-centos-master-trigger' - triggers: - - timed: '' # '0 19 * * *' -- trigger: - name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-centos-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-nosdn-stor4nfv-ha-baremetal-centos-master-trigger' - triggers: - - timed: '' - -# ---------------------------- -# noha-baremetal-centos-master -# ---------------------------- -- trigger: - name: 'compass-os-nosdn-nofeature-noha-baremetal-centos-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-odl_l3-nofeature-noha-baremetal-centos-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-odl_l2-moon-noha-baremetal-centos-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-nosdn-kvm-noha-baremetal-centos-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-odl-sfc-noha-baremetal-centos-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-centos-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-nosdn-bar-noha-baremetal-centos-master-trigger' - triggers: - - timed: '' # '0 19 * * *' -- trigger: - name: 'compass-k8-nosdn-stor4nfv-noha-baremetal-centos-master-trigger' - triggers: - - timed: '' - - -# -------------------------- -# ha-huawei-pod7-danube -# -------------------------- -- trigger: - name: 'compass-os-nosdn-nofeature-ha-huawei-pod7-danube-trigger' - triggers: - - timed: '' # '0 19 * * *' -- trigger: - name: 'compass-os-nosdn-openo-ha-huawei-pod7-danube-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-odl_l3-nofeature-ha-huawei-pod7-danube-trigger' - triggers: - - timed: '' # '0 15 * * *' -- trigger: - name: 'compass-os-onos-nofeature-ha-huawei-pod7-danube-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-ocl-nofeature-ha-huawei-pod7-danube-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-onos-sfc-ha-huawei-pod7-danube-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-odl_l2-moon-ha-huawei-pod7-danube-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-nosdn-kvm-ha-huawei-pod7-danube-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-nosdn-ovs_dpdk-ha-huawei-pod7-danube-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-odl-sfc-ha-huawei-pod7-danube-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-k8-nosdn-nofeature-ha-huawei-pod7-danube-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-nosdn-bar-ha-huawei-pod7-danube-trigger' - triggers: - - timed: '' # '0 19 * * *' -- trigger: - name: 'compass-k8-nosdn-stor4nfv-ha-huawei-pod7-danube-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-nosdn-stor4nfv-ha-huawei-pod7-danube-trigger' - triggers: - - timed: '' - -# ---------------------------- -# noha-huawei-pod7-danube -# ---------------------------- -- trigger: - name: 'compass-os-nosdn-nofeature-noha-huawei-pod7-danube-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-odl_l3-nofeature-noha-huawei-pod7-danube-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-odl_l2-moon-noha-huawei-pod7-danube-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-nosdn-kvm-noha-huawei-pod7-danube-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-odl-sfc-noha-huawei-pod7-danube-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-nosdn-ovs_dpdk-noha-huawei-pod7-danube-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-nosdn-bar-noha-huawei-pod7-danube-trigger' - triggers: - - timed: '' # '0 19 * * *' -- trigger: - name: 'compass-k8-nosdn-stor4nfv-noha-huawei-pod7-danube-trigger' - triggers: - - timed: '' - -# ------------------- -# ha-baremetal-master -# ------------------- -- trigger: - name: 'compass-os-nosdn-nofeature-ha-baremetal-master-trigger' - triggers: - - timed: '0 20 2-30/2 * *' -- trigger: - name: 'compass-os-nosdn-openo-ha-baremetal-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-odl_l3-nofeature-ha-baremetal-master-trigger' - triggers: - - timed: '0 18 1-29/2 * *' -- trigger: - name: 'compass-os-onos-nofeature-ha-baremetal-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-ocl-nofeature-ha-baremetal-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-onos-sfc-ha-baremetal-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-odl_l2-moon-ha-baremetal-master-trigger' - triggers: - - timed: '' # '0 12 2-30/2 * *' -- trigger: - name: 'compass-os-nosdn-kvm-ha-baremetal-master-trigger' - triggers: - - timed: '0 14 1-29/2 * *' -- trigger: - name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-master-trigger' - triggers: - - timed: '0 16 2-30/2 * *' -- trigger: - name: 'compass-k8-nosdn-nofeature-ha-baremetal-master-trigger' - triggers: - - timed: '0 10 2-30/2 * *' -- trigger: - name: 'compass-os-odl-sfc-ha-baremetal-master-trigger' - triggers: - - timed: '0 10 1-29/2 * *' -- trigger: - name: 'compass-os-nosdn-bar-ha-baremetal-master-trigger' - triggers: - - timed: '0 2 2-30/2 * *' -- trigger: - name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-master-trigger' - triggers: - - timed: '0 16 1-29/2 * *' -- trigger: - name: 'compass-os-nosdn-stor4nfv-ha-baremetal-master-trigger' - triggers: - - timed: '0 20 1-29/2 * *' - -# --------------------- -# noha-baremetal-master -# --------------------- -- trigger: - name: 'compass-os-nosdn-kvm-noha-baremetal-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-nosdn-nofeature-noha-baremetal-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-odl_l3-nofeature-noha-baremetal-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-odl_l2-moon-noha-baremetal-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-odl-sfc-noha-baremetal-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-nosdn-bar-noha-baremetal-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-k8-nosdn-stor4nfv-noha-baremetal-master-trigger' - triggers: - - timed: '' - -# ------------------- -# ha-baremetal-gambia -# ------------------- -- trigger: - name: 'compass-os-nosdn-nofeature-ha-baremetal-gambia-trigger' - triggers: - - timed: '0 1 1-29/2 * *' -- trigger: - name: 'compass-os-nosdn-openo-ha-baremetal-gambia-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-odl_l3-nofeature-ha-baremetal-gambia-trigger' - triggers: - - timed: '0 21 2-30/2 * *' -- trigger: - name: 'compass-os-onos-nofeature-ha-baremetal-gambia-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-ocl-nofeature-ha-baremetal-gambia-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-onos-sfc-ha-baremetal-gambia-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-odl_l2-moon-ha-baremetal-gambia-trigger' - triggers: - - timed: '' # '0 5 1-29/2 * *' -- trigger: - name: 'compass-os-nosdn-kvm-ha-baremetal-gambia-trigger' - triggers: - - timed: '0 13 2-30/2 * *' -- trigger: - name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-gambia-trigger' - triggers: - - timed: '0 9 1-29/2 * *' -- trigger: - name: 'compass-k8-nosdn-nofeature-ha-baremetal-gambia-trigger' - triggers: - - timed: '0 5 1-29/2 * *' -- trigger: - name: 'compass-os-odl-sfc-ha-baremetal-gambia-trigger' - triggers: - - timed: '0 17 2-30/2 * *' -- trigger: - name: 'compass-os-nosdn-bar-ha-baremetal-gambia-trigger' - triggers: - - timed: '0 21 1-29/2 * *' -- trigger: - name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-gambia-trigger' - triggers: - - timed: '0 7 2-30/2 * *' -- trigger: - name: 'compass-os-nosdn-stor4nfv-ha-baremetal-gambia-trigger' - triggers: - - timed: '' - -# --------------------- -# noha-baremetal-gambia -# --------------------- -- trigger: - name: 'compass-os-nosdn-kvm-noha-baremetal-gambia-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-nosdn-nofeature-noha-baremetal-gambia-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-odl_l3-nofeature-noha-baremetal-gambia-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-odl_l2-moon-noha-baremetal-gambia-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-odl-sfc-noha-baremetal-gambia-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-gambia-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-nosdn-bar-noha-baremetal-gambia-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-k8-nosdn-stor4nfv-noha-baremetal-gambia-trigger' - triggers: - - timed: '' - -# ----------------- -# ha-virtual-master -# ----------------- -- trigger: - name: 'compass-os-nosdn-nofeature-ha-virtual-master-trigger' - triggers: - - timed: '0 21 * * *' -- trigger: - name: 'compass-os-nosdn-openo-ha-virtual-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-odl_l3-nofeature-ha-virtual-master-trigger' - triggers: - - timed: '0 19 2-30/2 * *' -- trigger: - name: 'compass-os-onos-nofeature-ha-virtual-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-ocl-nofeature-ha-virtual-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-onos-sfc-ha-virtual-master-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-odl_l2-moon-ha-virtual-master-trigger' - triggers: - - timed: '' # '30 12 1-29/2 * *' -- trigger: - name: 'compass-os-nosdn-kvm-ha-virtual-master-trigger' - triggers: - - timed: '0 13 1-29/2 * *' -- trigger: - name: 'compass-os-nosdn-ovs_dpdk-ha-virtual-master-trigger' - triggers: - - timed: '0 17 2-30/2 * *' -- trigger: - name: 'compass-k8-nosdn-nofeature-ha-virtual-master-trigger' - triggers: - - timed: '5 2 * * *' -- trigger: - name: 'compass-os-odl-sfc-ha-virtual-master-trigger' - triggers: - - timed: '0 16 2-30/2 * *' -- trigger: - name: 'compass-os-nosdn-bar-ha-virtual-master-trigger' - triggers: - - timed: '0 17 1-29/2 * *' -- trigger: - name: 'compass-k8-nosdn-stor4nfv-ha-virtual-master-trigger' - triggers: - - timed: '0 15 2-30/2 * *' -- trigger: - name: 'compass-os-nosdn-stor4nfv-ha-virtual-master-trigger' - triggers: - - timed: '0 19 2-30/2 * *' - -# ------------------- -# noha-virtual-master -# ------------------- -- trigger: - name: 'compass-os-nosdn-kvm-noha-virtual-master-trigger' - triggers: - - timed: '30 13 1-29/2 * *' -- trigger: - name: 'compass-os-nosdn-nofeature-noha-virtual-master-trigger' - triggers: - - timed: '0 14 2-30/2 * *' -- trigger: - name: 'compass-os-odl_l3-nofeature-noha-virtual-master-trigger' - triggers: - - timed: '0 15 1-29/2 * *' -- trigger: - name: 'compass-os-odl_l2-moon-noha-virtual-master-trigger' - triggers: - - timed: '' # '0 18 2-30/2 * *' -- trigger: - name: 'compass-os-odl-sfc-noha-virtual-master-trigger' - triggers: - - timed: '0 20 1-29/2 * *' -- trigger: - name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-master-trigger' - triggers: - - timed: '0 11 2-30/2 * *' -- trigger: - name: 'compass-os-nosdn-bar-noha-virtual-master-trigger' - triggers: - - timed: '0 22 1-29/2 * *' -- trigger: - name: 'compass-k8-nosdn-stor4nfv-noha-virtual-master-trigger' - triggers: - - timed: '0 10 2-30/2 * *' - -# ----------------- -# ha-virtual-gambia -# ----------------- -- trigger: - name: 'compass-os-nosdn-nofeature-ha-virtual-gambia-trigger' - triggers: - - timed: '0 23 1-29/2 * *' -- trigger: - name: 'compass-os-nosdn-openo-ha-virtual-gambia-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-odl_l3-nofeature-ha-virtual-gambia-trigger' - triggers: - - timed: '0 22 2-30/2 * *' -- trigger: - name: 'compass-os-onos-nofeature-ha-virtual-gambia-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-ocl-nofeature-ha-virtual-gambia-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-onos-sfc-ha-virtual-gambia-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-odl_l2-moon-ha-virtual-gambia-trigger' - triggers: - - timed: '0 20 1-29/2 * *' -- trigger: - name: 'compass-os-nosdn-kvm-ha-virtual-gambia-trigger' - triggers: - - timed: '0 16 2-30/2 * *' -- trigger: - name: 'compass-os-nosdn-ovs_dpdk-ha-virtual-gambia-trigger' - triggers: - - timed: '0 14 1-29/2 * *' -- trigger: - name: 'compass-os-odl-sfc-ha-virtual-gambia-trigger' - triggers: - - timed: '0 18 2-30/2 * *' -- trigger: - name: 'compass-k8-nosdn-nofeature-ha-virtual-gambia-trigger' - triggers: - - timed: '5 1 2-30/2 * *' -- trigger: - name: 'compass-os-nosdn-bar-ha-virtual-gambia-trigger' - triggers: - - timed: '0 19 1-29/2 * *' -- trigger: - name: 'compass-k8-nosdn-stor4nfv-ha-virtual-gambia-trigger' - triggers: - - timed: '0 15 1-29/2 * *' -- trigger: - name: 'compass-os-nosdn-stor4nfv-ha-virtual-gambia-trigger' - triggers: - - timed: '' - -# ------------------- -# noha-virtual-gambia -# ------------------- -- trigger: - name: 'compass-os-nosdn-kvm-noha-virtual-gambia-trigger' - triggers: - - timed: '0 15 1-29/2 * *' -- trigger: - name: 'compass-os-nosdn-nofeature-noha-virtual-gambia-trigger' - triggers: - - timed: '0 17 2-30/2 * *' -- trigger: - name: 'compass-os-odl_l3-nofeature-noha-virtual-gambia-trigger' - triggers: - - timed: '0 23 1-29/2 * *' -- trigger: - name: 'compass-os-odl_l2-moon-noha-virtual-gambia-trigger' - triggers: - - timed: '0 21 2-30/2 * *' -- trigger: - name: 'compass-os-odl-sfc-noha-virtual-gambia-trigger' - triggers: - - timed: '0 19 1-29/2 * *' -- trigger: - name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-gambia-trigger' - triggers: - - timed: '0 12 2-30/2 * *' -- trigger: - name: 'compass-os-nosdn-bar-noha-virtual-gambia-trigger' - triggers: - - timed: '0 12 1-29/2 * *' -- trigger: - name: 'compass-k8-nosdn-stor4nfv-noha-virtual-gambia-trigger' - triggers: - - timed: '0 13 2-30/2 * *' diff --git a/jjb/compass4nfv/compass-deploy.sh b/jjb/compass4nfv/compass-deploy.sh deleted file mode 100644 index 4a66026d6..000000000 --- a/jjb/compass4nfv/compass-deploy.sh +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/bash -set -x - -# log info to console -echo "Starting the deployment on baremetal environment using $INSTALLER_TYPE. This could take some time..." -echo "--------------------------------------------------------" -echo - -echo 1 > /proc/sys/vm/drop_caches - -export CONFDIR=$WORKSPACE/deploy/conf -if [[ "$BRANCH" = 'stable/danube' ]]; then - # source the properties file so we get OPNFV vars - source $BUILD_DIRECTORY/latest.properties - # echo the info about artifact that is used during the deployment - echo "Using ${OPNFV_ARTIFACT_URL/*\/} for deployment" - - if [[ ! "$JOB_NAME" =~ (verify|merge) ]]; then - # 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 - - export ISO_URL=file://$BUILD_DIRECTORY/compass.iso -else - export ISO_URL=file://$BUILD_DIRECTORY/compass.tar.gz -fi - -cd $WORKSPACE - -export OS_VERSION=${COMPASS_OS_VERSION} -export OPENSTACK_VERSION=${COMPASS_OPENSTACK_VERSION} - -if [[ "${DEPLOY_SCENARIO}" =~ "-ocl" ]]; then - export NETWORK_CONF_FILE=network_ocl.yml -elif [[ "${DEPLOY_SCENARIO}" =~ "-odl" ]]; then - export NETWORK_CONF_FILE=network_odl.yml -elif [[ "${DEPLOY_SCENARIO}" =~ "-onos" ]]; then - export NETWORK_CONF_FILE=network_onos.yml -elif [[ "${DEPLOY_SCENARIO}" =~ "-openo" ]]; then - export NETWORK_CONF_FILE=network_openo.yml -elif [[ "${DEPLOY_SCENARIO}" =~ "-ovs_dpdk" ]]; then - export NETWORK_CONF_FILE=network_dpdk.yml -else - export NETWORK_CONF_FILE=network.yml -fi - -if [[ "$NODE_NAME" =~ "-virtual" ]]; then - export NETWORK_CONF=$CONFDIR/vm_environment/$NODE_NAME/${NETWORK_CONF_FILE} - export DHA_CONF=$CONFDIR/vm_environment/${DEPLOY_SCENARIO}.yml - if [[ "${DEPLOY_SCENARIO}" =~ "-moon-noha" ]]; then - export VIRT_NUMBER=3 - elif [[ "${DEPLOY_SCENARIO}" =~ "-noha" ]]; then - export VIRT_NUMBER=2 - fi -else - export INSTALL_NIC=eth1 - export NETWORK_CONF=$CONFDIR/hardware_environment/$NODE_NAME/${NETWORK_CONF_FILE} - export DHA_CONF=$CONFDIR/hardware_environment/$NODE_NAME/${DEPLOY_SCENARIO}.yml -fi - -export DHA=${DHA_CONF} -export NETWORK=${NETWORK_CONF} - -source ./ci/deploy_ci.sh - -if [ $? -ne 0 ]; then - echo "depolyment failed!" - deploy_ret=1 -fi - -echo -echo "--------------------------------------------------------" -echo "Done!" - -exit $deploy_ret diff --git a/jjb/compass4nfv/compass-dovetail-jobs.yaml b/jjb/compass4nfv/compass-dovetail-jobs.yaml deleted file mode 100644 index ec62da3b7..000000000 --- a/jjb/compass4nfv/compass-dovetail-jobs.yaml +++ /dev/null @@ -1,192 +0,0 @@ ---- -- project: - - name: 'compass-dovetail-jobs' - installer: 'compass' - project: 'compass4nfv' - # --------------------------------- - # BRANCH ANCHORS - # --------------------------------- - danube: &danube - stream: danube - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - disabled: false - dovetail-branch: master - # ----------------------------------- - # POD, INSTALLER, AND BRANCH MAPPING - # ----------------------------------- - # CI PODs - # ----------------------------------- - pod: - - baremetal: - slave-label: compass-baremetal-branch - os-version: 'xenial' - <<: *danube - # ---------------------------------- - # scenarios - # ---------------------------------- - scenario: - - 'os-nosdn-nofeature-ha': - disabled: true - auto-trigger-name: 'compass-{scenario}-{pod}-weekly-{stream}-trigger' - - jobs: - - 'compass-{scenario}-{pod}-weekly-{stream}' - - 'compass-deploy-{pod}-weekly-{stream}' - -######################## -# job templates -######################## -- job-template: - name: 'compass-{scenario}-{pod}-weekly-{stream}' - - disabled: '{obj:disabled}' - - concurrent: false - - properties: - - build-blocker: - use-build-blocker: true - blocking-jobs: - - 'compass-os-.*?-{pod}-daily-.*?' - - 'compass-os-.*?-{pod}-weekly-.*?' - blocking-level: 'NODE' - - wrappers: - - build-name: - name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' - - fix-workspace-permissions - - triggers: - - '{auto-trigger-name}' - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - compass-dovetail-parameter: - installer: '{installer}' - gs-pathname: '{gs-pathname}' - - string: - name: DEPLOY_SCENARIO - default: '{scenario}' - - '{slave-label}-defaults' - - '{installer}-defaults' - - builders: - - description-setter: - description: "POD: $NODE_NAME" - - trigger-builds: - - project: 'compass-deploy-{pod}-weekly-{stream}' - current-parameters: false - predefined-parameters: | - DEPLOY_SCENARIO={scenario} - COMPASS_OS_VERSION={os-version} - same-node: true - block: true - - trigger-builds: - - project: 'dovetail-compass-{pod}-compliance_set-weekly-{stream}' - current-parameters: false - predefined-parameters: - DEPLOY_SCENARIO={scenario} - block: true - same-node: true - block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'FAILURE' - - trigger-builds: - - project: 'dovetail-compass-{pod}-proposed_tests-weekly-{stream}' - current-parameters: false - predefined-parameters: - DEPLOY_SCENARIO={scenario} - block: true - same-node: true - block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'FAILURE' - -- job-template: - name: 'compass-deploy-{pod}-weekly-{stream}' - - disabled: false - - concurrent: true - - properties: - - logrotate-default - - throttle: - enabled: true - max-total: 4 - max-per-node: 1 - option: 'project' - - build-blocker: - use-build-blocker: true - blocking-jobs: - - 'compass-deploy-{pod}-daily-.*?' - - 'compass-deploy-{pod}-weekly-.*' - - 'compass-verify-deploy-.*?' - blocking-level: 'NODE' - - wrappers: - - build-name: - name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' - - timeout: - timeout: 240 - abort: true - - fix-workspace-permissions - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - compass-dovetail-parameter: - installer: '{installer}' - gs-pathname: '{gs-pathname}' - - '{slave-label}-defaults' - - '{installer}-defaults' - - scm: - - git-scm - - builders: - - description-setter: - description: "POD: $NODE_NAME" - - shell: - !include-raw-escape: ./compass-download-artifact.sh - - shell: - !include-raw-escape: ./compass-deploy.sh - -######################## -# parameter macros -######################## -- parameter: - name: compass-dovetail-parameter - 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: GS_URL - default: '$GS_BASE{gs-pathname}' - description: "URL to Google Storage." - - choice: - name: COMPASS_OPENSTACK_VERSION - choices: - - 'newton' - -######################## -# trigger macros -######################## -- trigger: - name: 'compass-os-nosdn-nofeature-ha-baremetal-weekly-danube-trigger' - triggers: - - timed: '' # 'H H * * 0' - -- trigger: - name: 'dovetail-weekly-trigger' - triggers: - - timed: '' # 'H H * * 0' diff --git a/jjb/compass4nfv/compass-download-artifact.sh b/jjb/compass4nfv/compass-download-artifact.sh deleted file mode 100644 index f8915643f..000000000 --- a/jjb/compass4nfv/compass-download-artifact.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash -set -o errexit -set -o nounset -set -o pipefail - -# log info to console -echo "Downloading the $INSTALLER_TYPE artifact. This could take some time..." -echo "--------------------------------------------------------" -echo - -# get the latest.properties file in order to get info regarding latest artifact -[[ -d $BUILD_DIRECTORY ]] || mkdir -p $BUILD_DIRECTORY -curl -s -o $BUILD_DIRECTORY/latest.properties http://$GS_URL/latest.properties - -# check if we got the file -[[ -f $BUILD_DIRECTORY/latest.properties ]] || exit 1 - -# source the file so we get OPNFV vars -source $BUILD_DIRECTORY/latest.properties - -if [[ "$BRANCH" == 'stable/danube' ]]; then - # download the file - curl -s -o $BUILD_DIRECTORY/compass.iso http://$OPNFV_ARTIFACT_URL > gsutil.iso.log 2>&1 - # list the file - ls -al $BUILD_DIRECTORY/compass.iso -else - # download the file - curl -s -o $BUILD_DIRECTORY/compass.tar.gz http://$OPNFV_ARTIFACT_URL > gsutil.tar.gz.log 2>&1 - # list the file - ls -al $BUILD_DIRECTORY/compass.tar.gz -fi - -echo -echo "--------------------------------------------------------" -echo "Done!" diff --git a/jjb/compass4nfv/compass-logs.sh b/jjb/compass4nfv/compass-logs.sh deleted file mode 100644 index c028194e7..000000000 --- a/jjb/compass4nfv/compass-logs.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash -set -o nounset -set -o pipefail - -# log info to console -echo "Uploading the logs $INSTALLER_TYPE artifact. This could take some time..." -echo "--------------------------------------------------------" -echo - -# create the log directory if it doesn't exist -[[ -d $LOG_DIRECTORY ]] || mkdir -p $LOG_DIRECTORY - -OPNFV_ARTIFACT_VERSION=$(date -u +"%Y-%m-%d_%H-%M-%S") -COMPASS_LOG_FILENAME="${JOB_NAME}_${BUILD_NUMBER}_${OPNFV_ARTIFACT_VERSION}.log.tar.gz" - - -sudo docker exec compass-tasks /bin/bash /opt/collect-log.sh -sudo docker cp compass-tasks:/opt/log.tar.gz ${LOG_DIRECTORY}/${COMPASS_LOG_FILENAME} - -sudo chown $(whoami):$(whoami) ${LOG_DIRECTORY}/${COMPASS_LOG_FILENAME} - -gsutil cp "${LOG_DIRECTORY}/${COMPASS_LOG_FILENAME}" \ - "gs://${GS_URL}/logs/${COMPASS_LOG_FILENAME}" > /dev/null 2>&1 - -echo -echo "--------------------------------------------------------" -echo "Done!" -echo "Artifact is available as http://${GS_URL}/logs/${COMPASS_LOG_FILENAME}" diff --git a/jjb/compass4nfv/compass-makeppa.sh b/jjb/compass4nfv/compass-makeppa.sh deleted file mode 100644 index fc5db2389..000000000 --- a/jjb/compass4nfv/compass-makeppa.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -set -x -set -o errexit -set -o nounset -set -o pipefail -# make ppa -cd $WORKSPACE/ -./build/make_repo.sh -# calc SHA512 of ppa -cd $PPA_CACHE -for i in $(find *.gz *.iso *.img -type f) -do - sha512sum=$(sha512sum $i | cut -d ' ' -f1) - echo $sha512sum > $i.sha512 - curl -T $i $PPA_REPO - curl -T $i.sha512 $PPA_REPO -done diff --git a/jjb/compass4nfv/compass-project-jobs.yaml b/jjb/compass4nfv/compass-project-jobs.yaml deleted file mode 100644 index 17745a29e..000000000 --- a/jjb/compass4nfv/compass-project-jobs.yaml +++ /dev/null @@ -1,135 +0,0 @@ ---- -- project: - - name: compass-project - - installer: 'compass' - - project: 'compass4nfv' - - slave-label: 'compass-virtual' - - stream: - - master: - branch: '{stream}' - gs-pathname: '' - ppa-pathname: '/{stream}' - disabled: false - - danube: - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - ppa-pathname: '/{stream}' - disabled: false - - gambia: - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - ppa-pathname: '/{stream}' - disabled: false - - jobs: - - '{installer}-build-daily-{stream}' - - 'compass-build-ppa-{stream}' - -######################## -# job templates -######################## -- job-template: - name: '{installer}-build-daily-{stream}' - - disabled: '{obj:disabled}' - - concurrent: true - - properties: - - logrotate-default - - throttle: - enabled: true - max-total: 1 - max-per-node: 1 - option: 'project' - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - compass-project-parameter: - installer: '{installer}' - gs-pathname: '{gs-pathname}' - ppa-pathname: '{ppa-pathname}' - - 'opnfv-build-ubuntu-defaults' - - '{installer}-defaults' - - scm: - - git-scm - - triggers: - - timed: 'H 8 * * *' - - builders: - - shell: - !include-raw-escape: ./compass-build.sh - - shell: - !include-raw-escape: ./compass-upload-artifact.sh - - 'clean-workspace' - -- job-template: - name: 'compass-build-ppa-{stream}' - - description: "build ppa(using docker) in huawei lab" - - disabled: '{obj:disabled}' - - node: huawei-build - - concurrent: true - - properties: - - logrotate-default - - throttle: - enabled: true - max-total: 1 - max-per-node: 1 - option: 'project' - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - compass-project-parameter: - installer: '{installer}' - gs-pathname: '{gs-pathname}' - ppa-pathname: '{ppa-pathname}' - - '{node}-defaults' - - '{installer}-defaults' - scm: - - git-scm - - builders: - - shell: - !include-raw-escape: ./compass-makeppa.sh - - -######################## -# parameter macros -######################## -- parameter: - name: compass-project-parameter - 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/$PROJECT{gs-pathname}" - description: "Directory where the cache to be used during the build is located." - - string: - name: GS_URL - default: '$GS_BASE{gs-pathname}' - description: "URL to Google Storage." - - string: - name: PPA_REPO - default: "https://artifacts.opnfv.org/compass4nfv/package{ppa-pathname}" - - string: - name: PPA_CACHE - default: "$WORKSPACE/work/repo/" diff --git a/jjb/compass4nfv/compass-upload-artifact.sh b/jjb/compass4nfv/compass-upload-artifact.sh deleted file mode 100644 index 87a9334b2..000000000 --- a/jjb/compass4nfv/compass-upload-artifact.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/bash -set -o nounset -set -o pipefail - -# log info to console -echo "Uploading the $INSTALLER_TYPE artifact. This could take some time..." -echo "--------------------------------------------------------" -echo - -if [[ "$BRANCH" == 'stable/danube' ]]; then - FILETYPE='iso' -else - FILETYPE='tar.gz' -fi -# source the opnfv.properties to get ARTIFACT_VERSION -source $BUILD_DIRECTORY/opnfv.properties - -# 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 - -signiso () { -time gpg2 -vvv --batch --yes --no-tty \ - --default-key opnfv-helpdesk@rt.linuxfoundation.org \ - --passphrase besteffort \ - --detach-sig $BUILD_DIRECTORY/compass.$FILETYPE - -gsutil cp $BUILD_DIRECTORY/compass.$FILETYPE.sig gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.$FILETYPE.sig -echo "ISO signature Upload Complete!" -} - -signiso - -# upload artifact and additional files to google storage -gsutil cp $BUILD_DIRECTORY/compass.$FILETYPE gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.$FILETYPE > gsutil.$FILETYPE.log 2>&1 -gsutil cp $BUILD_DIRECTORY/opnfv.properties gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.properties > gsutil.properties.log 2>&1 -gsutil cp $BUILD_DIRECTORY/opnfv.properties gs://$GS_URL/latest.properties > gsutil.latest.log 2>&1 - -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.$FILETYPE > /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.$FILETYPE > /dev/null 2>&1 -if [[ $? -ne 0 ]]; then - echo "Problem while uploading artifact!" - echo "Check log $WORKSPACE/gsutil.$FILETYPE.log on the machine where this build is done." - exit 1 -fi - -echo -echo "--------------------------------------------------------" -echo "Done!" -echo "Artifact is available as http://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.$FILETYPE" diff --git a/jjb/compass4nfv/compass-verify-jobs.yaml b/jjb/compass4nfv/compass-verify-jobs.yaml deleted file mode 100644 index daedff797..000000000 --- a/jjb/compass4nfv/compass-verify-jobs.yaml +++ /dev/null @@ -1,345 +0,0 @@ ---- -- project: - name: 'compass-verify-jobs' - - project: 'compass4nfv' - - installer: 'compass' - ##################################### - # branch definitions - ##################################### - stream: - - master: - branch: '{stream}' - gs-pathname: '' - ppa-pathname: '/{stream}' - disabled: false - openstack-version: 'queens' - branch-type: 'master' - - gambia: - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - ppa-pathname: '/{stream}' - disabled: false - openstack-version: 'queens' - branch-type: 'master' - - distro: - - 'xenial': - disabled: false - os-version: 'xenial' - openstack-os-version: '' - - 'centos7': - disabled: true - os-version: 'centos7' - openstack-os-version: '' - ##################################### - # patch verification phases - ##################################### - phase: - - 'basic' - - 'deploy-virtual' - ##################################### - # jobs - ##################################### - jobs: - - 'compass-verify-{distro}-{stream}' - - 'compass-verify-k8-{distro}-{stream}' - - 'compass-verify-{phase}-{distro}-{stream}' -##################################### -# job templates -##################################### -- job-template: - name: 'compass-verify-{distro}-{stream}' - - project-type: multijob - - disabled: '{obj:disabled}' - - concurrent: true - - properties: - - logrotate-default - - throttle: - enabled: true - max-total: 4 - max-per-node: 1 - option: 'project' - - build-blocker: - use-build-blocker: true - blocking-jobs: - - 'compass-verify-[^-]*-[^-]*' - - 'compass-os-.*?-virtual-daily-.*?' - - 'compass-k8-.*?-virtual-daily-.*?' - blocking-level: 'NODE' - - wrappers: - - ssh-agent-wrapper - - timeout: - timeout: 360 - fail: true - - fix-workspace-permissions - - 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}' - file-paths: - - compare-type: ANT - pattern: '**/*' - disable-strict-forbidden-file-verification: 'true' - forbidden-file-paths: - - compare-type: ANT - pattern: 'docs/**' - readable-message: true - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - 'compass-virtual-{branch-type}-defaults' - - '{installer}-defaults' - - 'compass-verify-defaults': - installer: '{installer}' - gs-pathname: '{gs-pathname}' - ppa-pathname: '{ppa-pathname}' - - string: - name: DEPLOY_SCENARIO - default: 'os-nosdn-nofeature-ha' - - builders: - - description-setter: - description: "Built on $NODE_NAME" - - multijob: - name: basic - condition: SUCCESSFUL - projects: - - name: 'opnfv-lint-verify-{stream}' - current-parameters: true - node-parameters: true - kill-phase-on: FAILURE - abort-all-job: true - - multijob: - name: deploy-virtual - condition: SUCCESSFUL - projects: - - name: 'compass-verify-deploy-virtual-{distro}-{stream}' - current-parameters: true - predefined-parameters: | - COMPASS_OS_VERSION={os-version} - COMPASS_OPENSTACK_VERSION={openstack-version} - node-parameters: true - kill-phase-on: FAILURE - abort-all-job: true - - multijob: - name: smoke-test - condition: SUCCESSFUL - projects: - - name: 'functest-compass-virtual-suite-{stream}' - current-parameters: false - predefined-parameters: | - FUNCTEST_MODE=tier - FUNCTEST_TIER=healthcheck - DEPLOY_SCENARIO=os-nosdn-nofeature-ha - node-parameters: true - kill-phase-on: NEVER - abort-all-job: true - -- job-template: - name: 'compass-verify-k8-{distro}-{stream}' - - project-type: multijob - - disabled: '{obj:disabled}' - - concurrent: true - - properties: - - logrotate-default - - throttle: - enabled: true - max-total: 4 - max-per-node: 1 - option: 'project' - - build-blocker: - use-build-blocker: true - blocking-jobs: - - 'compass-verify-[^-]*-[^-]*' - - 'compass-os-.*?-virtual-daily-.*?' - blocking-level: 'NODE' - - wrappers: - - ssh-agent-wrapper - - timeout: - timeout: 240 - fail: true - - fix-workspace-permissions - - scm: - - git-scm-gerrit - - triggers: - - gerrit: - server-name: 'gerrit.opnfv.org' - trigger-on: - - comment-added-contains-event: - comment-contains-value: 'check k8' - - comment-added-contains-event: - comment-contains-value: 'verify k8' - - comment-added-contains-event: - comment-contains-value: 'check kubernetes' - - comment-added-contains-event: - comment-contains-value: 'verify kubernetes' - projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - file-paths: - - compare-type: ANT - pattern: '**/*' - forbidden-file-paths: - - compare-type: ANT - pattern: 'docs/**' - readable-message: true - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - 'compass-virtual-{branch-type}-defaults' - - '{installer}-defaults' - - 'compass-verify-defaults': - installer: '{installer}' - gs-pathname: '{gs-pathname}' - ppa-pathname: '{ppa-pathname}' - - string: - name: DEPLOY_SCENARIO - default: 'k8-nosdn-nofeature-ha' - - builders: - - description-setter: - description: "Built on $NODE_NAME" - - multijob: - name: basic - condition: SUCCESSFUL - projects: - - name: 'opnfv-lint-verify-{stream}' - current-parameters: true - node-parameters: true - kill-phase-on: FAILURE - abort-all-job: true - - multijob: - name: deploy-virtual - condition: SUCCESSFUL - projects: - - name: 'compass-verify-deploy-virtual-{distro}-{stream}' - current-parameters: true - predefined-parameters: | - COMPASS_OS_VERSION={os-version} - node-parameters: true - kill-phase-on: FAILURE - abort-all-job: true - -- job-template: - name: 'compass-verify-{phase}-{distro}-{stream}' - - disabled: '{obj:disabled}' - - concurrent: true - - properties: - - logrotate-default - - throttle: - enabled: true - max-per-node: 1 - option: 'project' - - build-blocker: - use-build-blocker: true - blocking-jobs: - - 'compass-os-.*?-virtual-daily-.*?' - - 'compass-verify-deploy-.*' - - 'functest-compass-virtual.*' - blocking-level: 'NODE' - - wrappers: - - ssh-agent-wrapper - - timeout: - timeout: 360 - fail: true - - fix-workspace-permissions - - scm: - - git-scm-gerrit - - builders: - - description-setter: - description: "Built on $NODE_NAME" - - '{project}-verify-{phase}-macro' - -##################################### -# builder macros -##################################### -- builder: - name: 'compass4nfv-verify-basic-macro' - builders: - - shell: | - #!/bin/bash - - echo "Not activated!" - -- builder: - name: 'compass4nfv-verify-deploy-virtual-macro' - builders: - - shell: - !include-raw: ./compass-build.sh - - shell: - !include-raw: ./compass-deploy.sh -##################################### -# parameter macros -##################################### -- parameter: - name: 'compass-verify-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/$PROJECT{gs-pathname}" - description: "Directory where the cache to be used during the build is located." - - string: - name: GS_URL - default: '$GS_BASE{gs-pathname}' - description: "URL to Google Storage." - - string: - name: PPA_REPO - default: "https://artifacts.opnfv.org/compass4nfv/package{ppa-pathname}" - - string: - name: PPA_CACHE - default: "$WORKSPACE/work/repo/" - - choice: - name: COMPASS_OS_VERSION - choices: - - 'xenial' - - 'centos7' diff --git a/jjb/compass4nfv/compass-workspace-precleanup.sh b/jjb/compass4nfv/compass-workspace-precleanup.sh deleted file mode 100644 index e4a301bab..000000000 --- a/jjb/compass4nfv/compass-workspace-precleanup.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -set -o errexit -set -o nounset -set -o pipefail - -cd $WORKSPACE/.. -sudo rm $WORKSPACE -rf -git clone $GIT_BASE $WORKSPACE \ No newline at end of file diff --git a/jjb/compass4nfv/compass4nfv-rtd-jobs.yaml b/jjb/compass4nfv/compass4nfv-rtd-jobs.yaml deleted file mode 100644 index 7d136881a..000000000 --- a/jjb/compass4nfv/compass4nfv-rtd-jobs.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -- project: - name: compass4nfv-rtd - project: compass4nfv - project-name: compass4nfv - - gerrit-skip-vote: true - project-pattern: 'compass4nfv' - rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-compass4nfv/47358/' - rtd-token: '4208e8492be2e4eab7f18f1e70b5d78247d1b249' - - stream: - - master: - branch: '{stream}' - disabled: false - - gambia: - branch: 'stable/{stream}' - disabled: false - - jobs: - - '{project-name}-rtd-jobs' diff --git a/jjb/container4nfv/arm64/compass-build.sh b/jjb/container4nfv/arm64/compass-build.sh deleted file mode 100755 index 48381cb00..000000000 --- a/jjb/container4nfv/arm64/compass-build.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -set -e - -cd compass4nfv - -COMPASS_WORK_DIR=$WORKSPACE/../compass-work -mkdir -p $COMPASS_WORK_DIR -ln -s $COMPASS_WORK_DIR work - -sudo docker rm -f `docker ps | grep compass | cut -f1 -d' '` || true - -curl -s http://people.linaro.org/~yibo.cai/compass/compass4nfv-arm64-fixup.sh | bash || true - -./build.sh diff --git a/jjb/container4nfv/arm64/compass-deploy.sh b/jjb/container4nfv/arm64/compass-deploy.sh deleted file mode 100755 index 7889c3bba..000000000 --- a/jjb/container4nfv/arm64/compass-deploy.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -set -e - -cd compass4nfv - -export ADAPTER_OS_PATTERN='(?i)CentOS-7.*arm.*' -export OS_VERSION="centos7" -export KUBERNETES_VERSION="v1.9.1" -if [[ "$NODE_NAME" =~ "-virtual" ]]; then - export DHA="deploy/conf/vm_environment/k8-nosdn-nofeature-noha.yml" - export NETWORK="deploy/conf/vm_environment/network.yml" - export VIRT_NUMBER=2 VIRT_CPUS=8 VIRT_MEM=8192 VIRT_DISK=50G -else - export DHA="deploy/conf/hardware_environment/huawei-pod8/k8-nosdn-nofeature-noha.yml" - export NETWORK="deploy/conf/hardware_environment/huawei-pod8/network.yml" -fi - -./deploy.sh diff --git a/jjb/container4nfv/container4nfv-arm64.yaml b/jjb/container4nfv/container4nfv-arm64.yaml index 04fdd5a1d..b72c09547 100644 --- a/jjb/container4nfv/container4nfv-arm64.yaml +++ b/jjb/container4nfv/container4nfv-arm64.yaml @@ -1,99 +1,5 @@ --- -- project: - name: 'container4nfv-arm64' - project: 'container4nfv' - installer: 'compass' - stream: - - master: - branch: master - - hunter: - branch: stable/hunter - scenario: - - 'k8-multus-nofeature-noha': - disabled: false - - 'k8-sriov-nofeature-noha': - disabled: false - - 'k8-vpp-nofeature-noha': - disabled: false - pod: - - virtual: - slave-label: arm-packet01 - - baremetal: - slave-label: compass-baremetal-arm - jobs: - - 'container4nfv-arm-deploy-{pod}-daily-{stream}' - - 'container4nfv-{scenario}-{pod}-daily-{stream}' - - -- job-template: - name: 'container4nfv-arm-deploy-{pod}-daily-{stream}' - disabled: false - node: '{slave-label}' - - wrappers: - - timeout: - timeout: 300 - fail: true - - scm: - - git: - url: https://gerrit.opnfv.org/gerrit/compass4nfv - branches: - - '{branch}' - basedir: compass4nfv - wipe-workspace: true - - triggers: - - 'trigger-deploy-{pod}-{stream}' - - builders: - - shell: !include-raw: arm64/compass-build.sh - - shell: !include-raw: arm64/compass-deploy.sh - - trigger-builds: - - project: yardstick-arm64-compass-arm-virtual03-daily-master - current-parameters: false - same-node: true - block: true - block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'Failure' - - project: functest-compass-arm-virtual-daily-master - current-parameters: false - predefined-parameters: DEPLOY_SCENARIO='k8-nosdn-nofeature-ha' - same-node: true - block: true - block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'Failure' - - project: container4nfv-k8-multus-nofeature-noha-{pod}-daily-{stream} - current-parameters: true - same-node: true - block: true - block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'Failure' - - project: container4nfv-k8-sriov-nofeature-noha-{pod}-daily-{stream} - current-parameters: true - same-node: true - block: true - block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'Failure' - - project: container4nfv-k8-vpp-nofeature-noha-{pod}-daily-{stream} - current-parameters: true - same-node: true - block: true - block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'never' - - - job-template: name: 'container4nfv-{scenario}-{pod}-daily-{stream}' disabled: '{obj:disabled}' diff --git a/jjb/container4nfv/yardstick-arm64.yaml b/jjb/container4nfv/yardstick-arm64.yaml deleted file mode 100644 index 6ed345ecc..000000000 --- a/jjb/container4nfv/yardstick-arm64.yaml +++ /dev/null @@ -1,130 +0,0 @@ ---- -################################### -# job configuration for yardstick -################################### -- project: - name: yardstick-arm64 - - project: 'yardstick' - - # ------------------------------- - # BRANCH ANCHORS - # ------------------------------- - master: &master - stream: master - branch: '{stream}' - gs-pathname: '' - docker-tag: 'latest' - fraser: &fraser - stream: fraser - branch: '{stream}' - gs-pathname: 'stable/{stream}' - docker-tag: 'stable' - # ------------------------------- - # POD, INSTALLER, AND BRANCH MAPPING - # ------------------------------- - # Installers using labels - # CI PODs - # This section should only contain the installers - # that have been switched using labels for slaves - # ------------------------------- - pod: - # apex CI PODs - - arm-virtual03: - slave-label: arm-packet01 - installer: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *master - # ------------------------------- - testsuite: - - 'daily' - - jobs: - - 'yardstick-arm64-{installer}-{pod}-{testsuite}-{stream}' - -################################ -# job templates -################################ -- job-template: - name: 'yardstick-arm64-{installer}-{pod}-{testsuite}-{stream}' - disabled: false - - concurrent: true - - properties: - - logrotate-default - - throttle: - enabled: true - max-per-node: 1 - option: 'project' - - wrappers: - - build-name: - name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' - - timeout: - timeout: 60 - abort: true - - triggers: - - '{auto-trigger-name}' - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - '{installer}-defaults' - - 'yardstick-params-{slave-label}' - - string: - name: DEPLOY_SCENARIO - default: 'k8-nosdn-lb-noha_daily' - - string: - name: DOCKER_TAG - default: '{docker-tag}' - description: 'Tag to pull docker image' - - string: - name: YARDSTICK_SCENARIO_SUITE_NAME - default: opnfv_${{DEPLOY_SCENARIO}}_{testsuite}.yaml - description: 'Path to test scenario suite' - - string: - name: CI_DEBUG - default: 'false' - description: "Show debut output information" - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: "Used for overriding the GIT URL coming from Global Jenkins configuration." - - scm: - - git-scm - - builders: - - description-setter: - description: "POD: $NODE_NAME" - - 'yardstick-arm64' - - publishers: - - email: - recipients: trevor.tao@arm.com yibo.cai@arm.com - - email-jenkins-admins-on-failure - -######################## -# builder macros -######################## -- builder: - name: yardstick-arm64 - builders: - - shell: - !include-raw: arm64/yardstick-arm64.sh - -######################## -# parameter macros -######################## - - -- parameter: - name: 'yardstick-params-arm-packet01' - parameters: - - string: - name: YARDSTICK_DB_BACKEND - default: '-i 104.197.68.199:8086' - description: 'Arguments to use in order to choose the backend DB' diff --git a/jjb/dovetail/dovetail-ci-jobs.yaml b/jjb/dovetail/dovetail-ci-jobs.yaml index d45a2eabb..3e5c052f6 100644 --- a/jjb/dovetail/dovetail-ci-jobs.yaml +++ b/jjb/dovetail/dovetail-ci-jobs.yaml @@ -61,27 +61,6 @@ SUT: fuel auto-trigger-name: 'daily-trigger-disabled' <<: *hunter - # compass CI PODs - - baremetal: - slave-label: compass-baremetal - SUT: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *master - - virtual: - slave-label: compass-virtual - SUT: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *master - - baremetal: - slave-label: compass-baremetal - SUT: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *hunter - - virtual: - slave-label: compass-virtual - SUT: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *hunter # ------------------------------- # Installers not using labels # CI PODs @@ -123,11 +102,6 @@ # ------------------------------- # None-CI PODs # ------------------------------- - - baremetal-centos: - slave-label: 'intel-pod8' - SUT: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *master - zte-pod1: slave-label: zte-pod1 SUT: fuel diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh index 0440c4beb..e914ae1a2 100755 --- a/jjb/dovetail/dovetail-run.sh +++ b/jjb/dovetail/dovetail-run.sh @@ -79,10 +79,6 @@ get_apex_cred_file() { get_cred_file_with_scripts } -get_compass_cred_file() { - get_cred_file_with_scripts -} - get_fuel_cred_file() { get_cred_file_with_scripts } @@ -101,9 +97,7 @@ change_cred_file_cacert_path() { exists=`check_file_exists ${CACERT}` if [[ $exists == 0 ]]; then echo "INFO: set ${INSTALLER_TYPE} openstack cacert file to be ${CACERT}" - if [[ ${INSTALLER_TYPE} == "compass" ]]; then - echo "export OS_CACERT=${CACERT}" >> ${OPENRC} - elif [[ ${INSTALLER_TYPE} == "fuel" ]]; then + if [[ ${INSTALLER_TYPE} == "fuel" ]]; then sed -i "s#/etc/ssl/certs/mcp_os_cacert#${CACERT}#g" ${OPENRC} fi else @@ -127,8 +121,6 @@ change_cred_file_ext_net() { get_cred_file() { if [[ ${INSTALLER_TYPE} == 'apex' ]]; then get_apex_cred_file - elif [[ ${INSTALLER_TYPE} == 'compass' ]]; then - get_compass_cred_file elif [[ ${INSTALLER_TYPE} == 'fuel' ]]; then get_fuel_cred_file elif [[ ${INSTALLER_TYPE} == 'joid' ]]; then @@ -152,30 +144,6 @@ get_cred_file() { fi } -get_compass_pod_file() { - compass_repo=${WORKSPACE}/compass4nfv/ - echo "INFO: clone compass repo..." - git clone https://github.com/opnfv/compass4nfv.git ${compass_repo} >/dev/null - scenario_file=${compass_repo}/deploy/conf/hardware_environment/$NODE_NAME/os-nosdn-nofeature-ha.yml - ipmiIp=$(cat ${scenario_file} | shyaml get-value hosts.0.ipmiIp) - ipmiPass=$(cat ${scenario_file} | shyaml get-value hosts.0.ipmiPass) - ipmiUser=root - jumpserver_ip=$(ifconfig | grep -A 5 docker0 | grep "inet addr" | cut -d ':' -f 2 | cut -d ' ' -f 1) - - cat << EOF >${POD} -nodes: -- {ip: ${jumpserver_ip}, name: node0, password: root, role: Jumpserver, user: root} -- {ip: 10.1.0.50, name: node1, password: root, role: controller, user: root, - ipmi_ip: ${ipmiIp}, ipmi_user: ${ipmiUser}, ipmi_password: ${ipmiPass}} -- {ip: 10.1.0.51, name: node2, password: root, role: controller, user: root} -- {ip: 10.1.0.52, name: node3, password: root, role: controller, user: root} -- {ip: 10.1.0.53, name: node4, password: root, role: compute, user: root} -- {ip: 10.1.0.54, name: node5, password: root, role: compute, user: root} - -EOF - -} - get_fuel_baremetal_pod_file() { fuel_ctl_ssh_options="${ssh_options} -i ${SSH_KEY}" ssh_user="ubuntu" @@ -226,9 +194,7 @@ get_pod_file_with_scripts() { sudo pip install -e ./ >/dev/null sudo pip install netaddr - if [[ ${INSTALLER_TYPE} == compass ]]; then - options="-u root -p root" - elif [[ ${INSTALLER_TYPE} == fuel ]]; then + if [[ ${INSTALLER_TYPE} == fuel ]]; then options="-u ubuntu -k /root/.ssh/id_rsa" elif [[ ${INSTALLER_TYPE} == apex ]]; then options="-u stack -k /root/.ssh/id_rsa" @@ -268,13 +234,6 @@ process_info: EOF } -change_compass_pod_file_process_info() { - cat << EOF >> ${POD} -process_info: -- {testcase_name: yardstick.ha.rabbitmq, attack_process: rabbitmq} -EOF -} - change_pod_file_process_info() { sudo chmod 666 ${POD} echo "INFO: adapt process info for $INSTALLER_TYPE ..." @@ -282,8 +241,6 @@ change_pod_file_process_info() { change_apex_pod_file_process_info elif [ "$INSTALLER_TYPE" == "fuel" ]; then change_fuel_pod_file_process_info - elif [ "$INSTALLER_TYPE" == "compass" ]; then - change_compass_pod_file_process_info fi } @@ -292,9 +249,7 @@ get_pod_file() { sudo pip install shyaml sudo yum install -y rubygems || sudo apt-get install -y ruby sudo gem install hiera-eyaml - if [[ ${INSTALLER_TYPE} == 'compass' ]]; then - get_compass_pod_file - elif [[ ${INSTALLER_TYPE} == 'fuel' && ${DEPLOY_TYPE} == 'baremetal' ]]; then + if [[ ${INSTALLER_TYPE} == 'fuel' && ${DEPLOY_TYPE} == 'baremetal' ]]; then get_fuel_baremetal_pod_file fi @@ -430,7 +385,7 @@ fi # Modify tempest_conf.yaml file tempest_conf_file=${DOVETAIL_CONFIG}/tempest_conf.yaml -if [[ ${INSTALLER_TYPE} == 'compass' || ${INSTALLER_TYPE} == 'apex' ]]; then +if [[ ${INSTALLER_TYPE} == 'apex' ]]; then volume_device='vdb' else volume_device='vdc' diff --git a/jjb/dovetail/dovetail-weekly-jobs.yaml b/jjb/dovetail/dovetail-weekly-jobs.yaml deleted file mode 100644 index 5a162bb7f..000000000 --- a/jjb/dovetail/dovetail-weekly-jobs.yaml +++ /dev/null @@ -1,139 +0,0 @@ ---- -- project: - name: dovetail-weekly-jobs - project: dovetail - # ------------------------------- - # BRANCH ANCHORS - # ------------------------------- - master: &master - stream: master - branch: '{stream}' - dovetail-branch: '{stream}' - gs-pathname: '' - docker-tag: 'latest' - danube: &danube - stream: danube - branch: 'stable/{stream}' - dovetail-branch: master - gs-pathname: '/{stream}' - docker-tag: 'latest' - - # ------------------------------- - # POD, INSTALLER, AND BRANCH MAPPING - # ------------------------------- - # Installers using labels - # CI PODs - # This section should only contain the installers - # that have been switched using labels for slaves - # ------------------------------- - pod: - # - baremetal: - # slave-label: apex-baremetal - # SUT: apex - # <<: *danube - - baremetal: - slave-label: compass-baremetal - SUT: compass - <<: *danube - # - baremetal: - # slave-label: fuel-baremetal - # SUT: fuel - # <<: *danube - # - baremetal: - # slave-label: joid-baremetal - # SUT: joid - # <<: *danube - - testsuite: - - 'debug' - - 'compliance_set' - - 'proposed_tests' - - loop: - - 'weekly': - job-timeout: 180 - - jobs: - - 'dovetail-{SUT}-{pod}-{testsuite}-{loop}-{stream}' - -################################ -# job template -################################ -- job-template: - name: 'dovetail-{SUT}-{pod}-{testsuite}-{loop}-{stream}' - - disabled: true - - concurrent: true - - properties: - - logrotate-default - - throttle: - enabled: true - max-per-node: 1 - option: 'project' - - wrappers: - - build-name: - name: '$BUILD_NUMBER Scenario: $DEPLOY_SCENARIO' - - timeout: - timeout: '{job-timeout}' - abort: true - - fix-workspace-permissions - - parameters: - - project-parameter: - project: '{project}' - branch: '{dovetail-branch}' - - '{SUT}-defaults' - - '{slave-label}-defaults' - - string: - name: DEPLOY_SCENARIO - default: 'os-nosdn-nofeature-ha' - - string: - name: DOCKER_TAG - default: '{docker-tag}' - description: 'Tag to pull dovetail docker image' - - string: - name: CI_DEBUG - default: 'true' - description: "Show debug output information" - - string: - name: TESTSUITE - default: '{testsuite}' - description: "dovetail testsuite to run" - - string: - name: DOVETAIL_REPO_DIR - default: "/home/opnfv/dovetail" - description: "Directory where the dovetail repository is cloned" - - scm: - - git-scm - - builders: - - description-setter: - description: "POD: $NODE_NAME" - - 'dovetail-cleanup' - - 'dovetail-run' - - publishers: - - archive: - artifacts: 'results/**/*' - allow-empty: true - fingerprint: true - - email-jenkins-admins-on-failure - -######################## -# builder macros -######################## -- builder: - name: dovetail-run-weekly - builders: - - shell: - !include-raw: ./dovetail-run.sh - -- builder: - name: dovetail-cleanup-weekly - builders: - - shell: - !include-raw: ./dovetail-cleanup.sh diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index ae57258bc..14143d2e8 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -74,9 +74,6 @@ rc_file=${HOME}/opnfv-openrc.sh if [[ ${INSTALLER_TYPE} == 'joid' ]]; then rc_file=$LAB_CONFIG/admin-openrc -elif [[ ${INSTALLER_TYPE} == 'compass' ]]; then - cacert_file_vol="-v ${HOME}/os_cacert:${FUNCTEST_DIR}/conf/os_cacert" - echo "export OS_CACERT=${FUNCTEST_DIR}/conf/os_cacert" >> ${HOME}/opnfv-openrc.sh elif [[ ${INSTALLER_TYPE} == 'fuel' ]] && [[ "${DEPLOY_SCENARIO}" =~ -ha$ ]]; then cacert_file_vol="-v ${HOME}/os_cacert:/etc/ssl/certs/mcp_os_cacert" fi @@ -120,20 +117,6 @@ if [[ ${INSTALLER_TYPE} == 'fuel' && ${DEPLOY_SCENARIO} == 'os-nosdn-nofeature-n envs="${envs} -e LIBVIRT_USER=ubuntu -e LIBVIRT_KEY_PATH=${FUNCTEST_DIR}/conf/libvirt_key" fi -if [[ ${INSTALLER_TYPE} == 'compass' && ${DEPLOY_SCENARIO} =~ 'sfc' ]]; then - ssh_key="/tmp/id_rsa" - user_config="/tmp/openstack_user_config.yml" - docker cp compass-tasks:/root/.ssh/id_rsa $ssh_key - docker cp compass-tasks:/etc/openstack_deploy/openstack_user_config.yml $user_config - sshkey_vol="-v ${ssh_key}:/root/.ssh/id_rsa" - userconfig_vol="-v ${user_config}:${user_config}" - envs="${envs} -e EXTERNAL_NETWORK=${EXTERNAL_NETWORK}" -fi - -if [[ ${INSTALLER_TYPE} == 'compass' ]] || [[ ${DEPLOY_SCENARIO} == *"odl"* ]]; then - envs="${envs} -e SDN_CONTROLLER_RESTCONFPORT=8080" -fi - if [[ ${DEPLOY_SCENARIO} == *"ovs"* ]] || [[ ${DEPLOY_SCENARIO} == *"fdio"* ]]; then if [[ -n ${IMAGE_PROPERTIES} ]]; then IMAGE_PROPERTIES="${IMAGE_PROPERTIES},hw_mem_page_size:large" @@ -170,26 +153,6 @@ volume-feature-enabled: backup: false EOF ;; -compass) - cat << EOF > "${tempest_conf_yaml}" ---- -compute-feature-enabled: - shelve: false - vnc_console: false - block_migration_for_live_migration: false - spice_console: true -identity-feature-enabled: - api_v2: false - api_v2_admin: false -image-feature-enabled: - api_v2: true - api_v1: false -volume: - storage_protocol: ceph -volume-feature-enabled: - backup: false -EOF - ;; fuel) cat << EOF > "${tempest_conf_yaml}" --- diff --git a/jjb/global/installer-params.yaml b/jjb/global/installer-params.yaml index f663c4556..163d9152b 100644 --- a/jjb/global/installer-params.yaml +++ b/jjb/global/installer-params.yaml @@ -15,22 +15,6 @@ default: 'external' description: 'external network for test' -- parameter: - name: 'compass-defaults' - parameters: - - string: - name: INSTALLER_IP - default: '192.168.200.2' - description: 'IP of the installer' - - string: - name: INSTALLER_TYPE - default: compass - description: 'Installer used for deploying OPNFV on this POD' - - string: - name: EXTERNAL_NETWORK - default: 'ext-net' - description: 'external network for test' - - parameter: name: 'fuel-defaults' parameters: diff --git a/jjb/global/releng-macros.yaml b/jjb/global/releng-macros.yaml index d1986ec72..cb6f0f285 100644 --- a/jjb/global/releng-macros.yaml +++ b/jjb/global/releng-macros.yaml @@ -641,17 +641,6 @@ recipients: > stephen.wong1@huawei.com -- publisher: &email_compass4nfv_ptl_defaults - name: 'email-compass4nfv-ptl' - publishers: - - email-ext: - <<: *email_ptl_defaults - recipients: > - chigang@huawei.com -- publisher: - name: 'email-compass-containers-ptl' - <<: *email_compass4nfv_ptl_defaults - - publisher: name: 'email-conductor-ptl' publishers: diff --git a/jjb/global/slave-params.yaml b/jjb/global/slave-params.yaml index 1a8ce417f..d721ff268 100644 --- a/jjb/global/slave-params.yaml +++ b/jjb/global/slave-params.yaml @@ -304,44 +304,6 @@ name: SSH_KEY default: /root/.ssh/id_rsa description: 'SSH key to use for Apex' -- parameter: - name: 'compass-baremetal-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'compass-baremetal' - all-nodes: false - node-eligibility: 'ignore-offline' - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - -- parameter: - name: 'compass-baremetal-master-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'compass-baremetal-master' - all-nodes: false - node-eligibility: 'ignore-offline' - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - -- parameter: - name: 'compass-baremetal-branch-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'compass-baremetal-branch' - all-nodes: false - node-eligibility: 'ignore-offline' - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - parameter: name: 'fuel-baremetal-defaults' @@ -443,58 +405,6 @@ default: /root/.ssh/id_rsa description: 'SSH key to use for Apex' -- parameter: - name: 'compass-virtual-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'compass-virtual' - all-nodes: false - node-eligibility: 'ignore-offline' - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - -- parameter: - name: 'compass-arm-virtual-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'compass-arm-virtual' - all-nodes: false - node-eligibility: 'ignore-offline' - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - -- parameter: - name: 'compass-virtual-master-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'compass-virtual-master' - all-nodes: false - node-eligibility: 'ignore-offline' - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - -- parameter: - name: 'compass-virtual-branch-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'compass-virtual-branch' - all-nodes: false - node-eligibility: 'ignore-offline' - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - - parameter: name: 'fuel-virtual-defaults' parameters: diff --git a/jjb/releng/compass4nfv-docker.yaml b/jjb/releng/compass4nfv-docker.yaml deleted file mode 100644 index 2eb2a207c..000000000 --- a/jjb/releng/compass4nfv-docker.yaml +++ /dev/null @@ -1,269 +0,0 @@ ---- -############################################## -# job configuration for docker build and push -############################################## -- project: - - name: compass-docker - - project: compass-containers - - stream: - - master: - branch: '{stream}' - disabled: false - - euphrates: - branch: 'stable/{stream}' - disabled: true - - gambia: - branch: 'stable/{stream}' - disabled: false - - arch_tag: - - 'amd64': - slave_label: 'opnfv-build-ubuntu' - docker_file: 'Dockerfile' - - 'arm64': - slave_label: 'opnfv-build-ubuntu-arm' - docker_file: 'Dockerfile-arm64' - - # yamllint disable rule:key-duplicates - image: - - 'tasks' - - 'cobbler' - - 'db' - - 'deck' - - 'tasks-base' - - 'tasks-k8s' - - 'tasks-osa' - - # settings for jobs run in multijob phases - build-job-settings: &build-job-settings - current-parameters: false - git-revision: true - node-parameters: false - predefined-parameters: | - PUSH_IMAGE=$PUSH_IMAGE - COMMIT_ID=$COMMIT_ID - GERRIT_REFNAME=$GERRIT_REFNAME - kill-phase-on: FAILURE - abort-all-jobs: false - - manifest-job-settings: &manifest-job-settings - current-parameters: false - git-revision: true - node-parameters: false - predefined-parameters: - GERRIT_REFNAME=$GERRIT_REFNAME - kill-phase-on: FAILURE - abort-all-jobs: false - - # yamllint enable rule:key-duplicates - jobs: - - "compass-docker-{stream}" - - "compass-{image}-build-{arch_tag}-{stream}" - - "compass-{image}-manifest-{stream}" - -######################## -# job templates -######################## -- job-template: - name: 'compass-docker-{stream}' - - project-type: multijob - - disabled: '{obj:disabled}' - - parameters: - - compass-job-parameters: - project: '{project}' - branch: '{branch}' - slave_label: 'opnfv-build-ubuntu' - docker_file: 'Dockerfile' - arch_tag: 'amd64' - - properties: - - throttle: - max-per-node: 1 - option: 'project' - - scm: - - git-scm - - triggers: - - pollscm: - cron: "*/30 * * * *" - - builders: - - multijob: - name: 'build compass-tasks-base images' - execution-type: PARALLEL - projects: - - name: 'compass-tasks-base-build-amd64-{stream}' - <<: *build-job-settings - - name: 'compass-tasks-base-build-arm64-{stream}' - <<: *build-job-settings - - multijob: - name: 'publish compass-tasks-base manifests' - execution-type: PARALLEL - projects: - - name: 'compass-tasks-base-manifest-{stream}' - <<: *manifest-job-settings - - multijob: - name: 'build all compass images' - condition: SUCCESSFUL - execution-type: PARALLEL - projects: - - name: 'compass-cobbler-build-amd64-{stream}' - <<: *build-job-settings - - name: 'compass-db-build-amd64-{stream}' - <<: *build-job-settings - - name: 'compass-deck-build-amd64-{stream}' - <<: *build-job-settings - - name: 'compass-tasks-build-amd64-{stream}' - <<: *build-job-settings - - name: 'compass-tasks-k8s-build-amd64-{stream}' - <<: *build-job-settings - - name: 'compass-tasks-osa-build-amd64-{stream}' - <<: *build-job-settings - - name: 'compass-cobbler-build-arm64-{stream}' - <<: *build-job-settings - - name: 'compass-db-build-arm64-{stream}' - <<: *build-job-settings - - name: 'compass-deck-build-arm64-{stream}' - <<: *build-job-settings - - name: 'compass-tasks-build-arm64-{stream}' - <<: *build-job-settings - - name: 'compass-tasks-k8s-build-arm64-{stream}' - <<: *build-job-settings - - name: 'compass-tasks-osa-build-arm64-{stream}' - <<: *build-job-settings - - multijob: - name: 'publish all manifests' - execution-type: PARALLEL - projects: - - name: 'compass-cobbler-manifest-{stream}' - <<: *manifest-job-settings - - name: 'compass-db-manifest-{stream}' - <<: *manifest-job-settings - - name: 'compass-deck-manifest-{stream}' - <<: *manifest-job-settings - - name: 'compass-tasks-manifest-{stream}' - <<: *manifest-job-settings - - name: 'compass-tasks-k8s-manifest-{stream}' - <<: *manifest-job-settings - - name: 'compass-tasks-osa-manifest-{stream}' - <<: *manifest-job-settings - - publishers: - - 'compass-amd64-recipients' - - 'compass-arm64-recipients' - -- job-template: - name: 'compass-{image}-build-{arch_tag}-{stream}' - disabled: '{obj:disabled}' - parameters: - - compass-job-parameters: - project: '{project}' - branch: '{branch}' - slave_label: '{slave_label}' - docker_file: '{docker_file}' - arch_tag: '{arch_tag}' - - string: - name: DOCKER_REPO_NAME - default: "opnfv/compass-{image}" - description: "Dockerhub repo to be pushed to." - - string: - name: DOCKER_DIR - default: "compass-{image}" - description: "Directory containing files needed by the Dockerfile" - scm: - - git-scm - builders: - - shell: - !include-raw-escape: ./opnfv-docker.sh - -- job-template: - name: 'compass-{image}-manifest-{stream}' - disabled: '{obj:disabled}' - parameters: - - compass-job-parameters: - project: '{project}' - branch: '{branch}' - slave_label: 'opnfv-build-ubuntu' - docker_file: 'Dockerfile' - arch_tag: 'amd64' - builders: - - shell: | - #!/bin/bash -ex - case "{stream}" in - "master") - sudo manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template opnfv/compass-{image}:ARCH-latest \ - --target opnfv/compass-{image}:latest ;; - *) - sudo manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template opnfv/compass-{image}:ARCH-stable \ - --target opnfv/compass-{image}:{stream} ;; - esac - exit $? - -# parameter macro -- parameter: - name: compass-job-parameters - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - label: - name: SLAVE_LABEL - default: '{slave_label}' - description: 'Slave label on Jenkins' - all-nodes: false - node-eligibility: 'ignore-offline' - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - - string: - name: PUSH_IMAGE - default: "true" - description: "To enable/disable pushing the image to Dockerhub." - - string: - name: COMMIT_ID - default: "" - description: "commit id to make a snapshot docker image" - - string: - name: GERRIT_REFNAME - default: "" - description: "Docker tag to be built, e.g. refs/tags/5.0.0, refs/tags/opnfv-5.0.0, refs/tags/5.0.RC1" - - string: - name: DOCKERFILE - default: '{docker_file}' - description: "Dockerfile to use for creating the image." - - string: - name: ARCH_TAG - default: "{arch_tag}" - description: "If set, this value will be added to the docker image tag as a prefix" - - string: - name: PROJECT - default: "{project}" - description: "Project name used to enable job conditions" - -# publisher macros -- publisher: - name: 'compass-amd64-recipients' - publishers: - - email: - recipients: > - huangxiangyu5@huawei.com - wutianwei1@huawei.com - -- publisher: - name: 'compass-arm64-recipients' - publishers: - - email: - recipients: > - yibo.cai@arm.com diff --git a/jjb/releng/opnfv-docker.sh b/jjb/releng/opnfv-docker.sh index 174bb57b9..de39f0628 100644 --- a/jjb/releng/opnfv-docker.sh +++ b/jjb/releng/opnfv-docker.sh @@ -23,9 +23,9 @@ function remove_containers_images() # # $ docker ps -a # CONTAINER ID IMAGE COMMAND ... - # 6a796ed40b8e opnfv/compass-tasks:latest "/bin/bash" ... - # 99fcb59f4787 opnfv/compass-tasks-base:latest "/bin/bash" ... - # cc5eee16b995 opnfv/compass-tasks-k8s "/bin/bash" ... + # 6a796ed40b8e opnfv/example-tasks:latest "/bin/bash" ... + # 99fcb59f4787 opnfv/example-tasks-base:latest "/bin/bash" ... + # cc5eee16b995 opnfv/example-tasks-k8s "/bin/bash" ... # # Cut image name by leading space and ending space or colon(tag) if [[ -n "$(docker ps -a | grep " $DOCKER_REPO_NAME[ :]")" ]]; then @@ -44,9 +44,9 @@ function remove_containers_images() # # $ docker images # REPOSITORY TAG IMAGE ID ... - # opnfv/compass-tasks latest 6501569fd328 ... - # opnfv/compass-tasks-base latest 8764fe29c434 ... - # opnfv/compass-tasks-k8s latest 61094cac9e65 ... + # opnfv/example-tasks latest 6501569fd328 ... + # opnfv/example-tasks-base latest 8764fe29c434 ... + # opnfv/example-tasks-k8s latest 61094cac9e65 ... # # Cut image name by start of line and ending space if [[ -n "$(docker images | grep "^$DOCKER_REPO_NAME ")" ]]; then diff --git a/jjb/storperf/storperf-daily-jobs.yaml b/jjb/storperf/storperf-daily-jobs.yaml index efbfbeb86..b5f510c1d 100644 --- a/jjb/storperf/storperf-daily-jobs.yaml +++ b/jjb/storperf/storperf-daily-jobs.yaml @@ -48,15 +48,6 @@ # slave-label: joid-virtual # installer: joid # <<: *master - # # compass CI PODs - # - baremetal: - # slave-label: compass-baremetal - # installer: compass - # <<: *master - # - virtual: - # slave-label: compass-virtual - # installer: compass - # <<: *master # # apex CI PODs # - virtual: # slave-label: apex-virtual-master diff --git a/jjb/yardstick/yardstick-daily-jobs.yaml b/jjb/yardstick/yardstick-daily-jobs.yaml index 8c3ba85eb..e12eee79f 100644 --- a/jjb/yardstick/yardstick-daily-jobs.yaml +++ b/jjb/yardstick/yardstick-daily-jobs.yaml @@ -113,27 +113,6 @@ installer: joid auto-trigger-name: 'daily-trigger-disabled' <<: *hunter - # compass CI PODs - - baremetal: - slave-label: compass-baremetal - installer: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *master - - virtual: - slave-label: compass-virtual - installer: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *master - - baremetal: - slave-label: compass-baremetal - installer: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *hunter - - virtual: - slave-label: compass-virtual - installer: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *hunter # daisy CI PODs - baremetal: slave-label: daisy-baremetal @@ -203,21 +182,6 @@ installer: joid auto-trigger-name: 'daily-trigger-disabled' <<: *master - - huawei-pod3: - slave-label: '{pod}' - installer: compass - auto-trigger-name: 'yardstick-daily-huawei-pod3-trigger' - <<: *master - - huawei-pod4: - slave-label: '{pod}' - installer: compass - auto-trigger-name: 'yardstick-daily-huawei-pod4-trigger' - <<: *master - - baremetal-centos: - slave-label: 'intel-pod8' - installer: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *master - flex-pod1: slave-label: '{pod}' installer: apex @@ -426,14 +390,6 @@ default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' -- parameter: - name: 'yardstick-params-compass-baremetal' - parameters: - - string: - name: YARDSTICK_DB_BACKEND - default: '-i 104.197.68.199:8086' - description: 'Arguments to use in order to choose the backend DB' - - parameter: name: 'yardstick-params-daisy-baremetal' parameters: @@ -514,14 +470,6 @@ default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' -- parameter: - name: 'yardstick-params-compass-virtual' - parameters: - - string: - name: YARDSTICK_DB_BACKEND - default: '-i 104.197.68.199:8086' - description: 'Arguments to use in order to choose the backend DB' - - parameter: name: 'yardstick-params-huawei-pod3' parameters: diff --git a/jjb/yardstick/yardstick-daily.sh b/jjb/yardstick/yardstick-daily.sh index dfe1404f0..91b3e8e0f 100755 --- a/jjb/yardstick/yardstick-daily.sh +++ b/jjb/yardstick/yardstick-daily.sh @@ -30,13 +30,6 @@ if [[ ${INSTALLER_TYPE} == 'joid' ]]; then # If dev lab, credentials may not be the default ones, just provide a path to put them into docker # replace the default one by the customized one provided by jenkins config fi -elif [[ ${INSTALLER_TYPE} == 'compass' ]]; then - if [[ "${DEPLOY_SCENARIO:0:2}" == "k8" ]];then - rc_file_vol="-v ${HOME}/admin.conf:/etc/yardstick/admin.conf" - else - cacert_file_vol="-v ${HOME}/os_cacert:/etc/yardstick/os_cacert" - echo "export OS_CACERT=/etc/yardstick/os_cacert" >> ${HOME}/opnfv-openrc.sh - fi elif [[ ${INSTALLER_TYPE} == 'fuel' ]]; then if [[ "${DEPLOY_SCENARIO:0:2}" == 'k8' ]]; then rc_file_vol="-v ${HOME}/admin.conf:/etc/yardstick/admin.conf" diff --git a/jjb/yardstick/yardstick-get-k8s-conf.sh b/jjb/yardstick/yardstick-get-k8s-conf.sh index 82744a4ee..3af2dcb71 100755 --- a/jjb/yardstick/yardstick-get-k8s-conf.sh +++ b/jjb/yardstick/yardstick-get-k8s-conf.sh @@ -6,9 +6,6 @@ dest_path="$HOME/admin.conf" if [[ "${DEPLOY_SCENARIO:0:2}" == "k8" ]];then if [[ ${INSTALLER_TYPE} == 'joid' ]];then juju scp kubernetes-master/0:config "${dest_path}" - elif [[ ${INSTALLER_TYPE} == 'compass' ]];then - echo "Copy admin.conf to ${dest_path}" - docker cp compass-tasks:/opt/admin.conf "${dest_path}" elif [[ ${INSTALLER_TYPE} == 'fuel' ]];then echo "Getting kubernetes config ..." docker cp -L fuel:/opt/kubernetes.config "${dest_path}"