9.x tests improvements

- Add "delete stacks" step to runner job
- Allow to pin swarm job to specific label
- Add ability to append suffix to job name (required for non-default
  fuel-devops labs like "8gb RAM per slave" or "multirack")
- Testrail reporter was moved to jenkins-master label
- Add test jobs itself
- Additional fixes around all mos jjb templates

Change-Id: If772ec80b5ceef62874f9e94a7cf7051c7033e0c

diff --git a/maintenance-ci/common/jobs/deploy-stack.yaml b/maintenance-ci/common/jobs/deploy-stack.yaml
index 882269c3df63a6b779dc6ee020c1847a2c49472d..37a371092a866ac9e4c06bd1e3e1103d78a0e7b9 100644 (file)
--- a/maintenance-ci/common/jobs/deploy-stack.yaml
+++ b/maintenance-ci/common/jobs/deploy-stack.yaml
@@ -3,7 +3,7 @@
     description: |
       Create given heat stack on internal cloud in maintenance-team tenant
 
-    concurrent: false
+    concurrent: true
     node: 'jenkins-master'
 
     parameters:

diff --git a/maintenance-ci/common/scripts/build_base_swarm_slave_image.sh b/maintenance-ci/common/scripts/build_base_swarm_slave_image.sh
index 6e382393409001abc4ff5182fbf2e8543de19500..b3e1e9ed17e03fdb6c764c6dadd5925d86c91574 100644 (file)
--- a/maintenance-ci/common/scripts/build_base_swarm_slave_image.sh
+++ b/maintenance-ci/common/scripts/build_base_swarm_slave_image.sh
@@ -12,6 +12,9 @@ sh -c 'echo "jenkins ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers.d/jenkins-user'
 mkdir /home/jenkins/.ssh
 echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDci6MBY68s3FJ9V1OP5vdtVo/daJnkNXCPSPYbCX8/d0E3UJKgE81YvsxfuKp3r1rUNwTuGnkq+VUWcbIgpQNy69OuKxQkoGsRgYTA8n4ZZcuWz+dVenP90xLYHcnyACg63HUVEp5foLvu1WzOdH2A4bHmsl0ePM5IdnFyToHj+Nhwz1NSvbK1OkQHoEcIbkbIkIa/kWY2mgEIIUgb9YmaCI96eiVtQpFPQ4k7hpdrUAkG4e0jT8JA3zQoB++S12p0d0K3SQtJ3+YATUm+rKnHchHZ/uEAgBgoOLiu99p7Aiie76jlGxZp8A/hPqU/zS61z7ER4lJeyR/pXh53Ja+1 maintenance-ci" > /home/jenkins/.ssh/authorized_keys
 
+sed -i "s/PasswordAuthentication no/PasswordAuthentication yes/" /etc/ssh/sshd_config
+sed -i "s/ChallengeResponseAuthentication no/ChallengeResponseAuthentication yes/" /etc/ssh/sshd_config
+
 export DEBIAN_FRONTEND=noninteractive
 
 sh -c 'echo "deb [trusted=yes] http://mirror.fuel-infra.org/infra/packages/xenial/ xenial main" > /etc/apt/sources.list.d/mirantis_repo.list'

diff --git a/maintenance-ci/common/scripts/build_mos_swarm_slave_image.sh b/maintenance-ci/common/scripts/build_mos_swarm_slave_image.sh
index ecae314a473e44ea724796bbdf88f5edea39297d..51757e53d2e03ef51fef0150f8346c1cf2d382e8 100644 (file)
--- a/maintenance-ci/common/scripts/build_mos_swarm_slave_image.sh
+++ b/maintenance-ci/common/scripts/build_mos_swarm_slave_image.sh
@@ -15,6 +15,9 @@ sh -c 'echo "jenkins ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers.d/jenkins-user'
 mkdir /home/jenkins/.ssh
 echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDci6MBY68s3FJ9V1OP5vdtVo/daJnkNXCPSPYbCX8/d0E3UJKgE81YvsxfuKp3r1rUNwTuGnkq+VUWcbIgpQNy69OuKxQkoGsRgYTA8n4ZZcuWz+dVenP90xLYHcnyACg63HUVEp5foLvu1WzOdH2A4bHmsl0ePM5IdnFyToHj+Nhwz1NSvbK1OkQHoEcIbkbIkIa/kWY2mgEIIUgb9YmaCI96eiVtQpFPQ4k7hpdrUAkG4e0jT8JA3zQoB++S12p0d0K3SQtJ3+YATUm+rKnHchHZ/uEAgBgoOLiu99p7Aiie76jlGxZp8A/hPqU/zS61z7ER4lJeyR/pXh53Ja+1 maintenance-ci" > /home/jenkins/.ssh/authorized_keys
 
+sed -i "s/PasswordAuthentication no/PasswordAuthentication yes/" /etc/ssh/sshd_config
+sed -i "s/ChallengeResponseAuthentication no/ChallengeResponseAuthentication yes/" /etc/ssh/sshd_config
+
 export DEBIAN_FRONTEND=noninteractive
 
 sh -c 'echo "deb [trusted=yes] http://mirror.fuel-infra.org/infra/packages/xenial/ xenial main" > /etc/apt/sources.list.d/mirantis_repo.list'

diff --git a/maintenance-ci/common/scripts/deploy_heat_stack.sh b/maintenance-ci/common/scripts/deploy_heat_stack.sh
index bfec3ac6292e99a4d8276f3a684353e5e2c1c483..d5dd2c93c4d8966b3eeac3571e754a210bb27b63 100755 (executable)
--- a/maintenance-ci/common/scripts/deploy_heat_stack.sh
+++ b/maintenance-ci/common/scripts/deploy_heat_stack.sh
@@ -35,7 +35,7 @@ else
   md5_cmd="md5"
 fi
 
-STACK_NAME="${STACK_PREFIX:-swarm_slave}_$(date +%s | "${md5_cmd}" | head -c 4)"
+STACK_NAME="${STACK_PREFIX:-swarm_slave}_$(head -c 100 /dev/random | "${md5_cmd}" | head -c 4)"
 
 set +x
 source "${OPENSTACK_CLIENTS_VENV}"/bin/activate

diff --git a/maintenance-ci/mos/jobs/9.x.swarm.micro.runner.yaml b/maintenance-ci/mos/jobs/9.x.swarm.micro.runner.yaml
index c633e76e78bd0b4e2b2d49a35058a112da3c0b31..7546e6c72909d21d3306915203b8bb4da18e8952 100644 (file)
--- a/maintenance-ci/mos/jobs/9.x.swarm.micro.runner.yaml
+++ b/maintenance-ci/mos/jobs/9.x.swarm.micro.runner.yaml
@@ -1,5 +1,5 @@
 - job:
-    name: '9.x.swarm.micro.runner'
+    name: '9.x..swarm.micro.runner'
     description: 'Run small set of system tests (debug purpose mainly)'
 
     concurrent: false
@@ -12,9 +12,13 @@
 
     parameters:
     - bool:
-        name: PREPARE_SLAVE
+        name: PREPARE_SWARM
         default: true
-        description: "Launch jenkins slaves?"
+        description: "Launch jenkins swarm?"
+    - bool:
+        name: CLEANUP_SWARM
+        default: true
+        description: "Wipe jenkins swarm after tests?"
     - 9x-systest-params
     - mos-jenkins-swarm-params
 
@@ -29,7 +33,7 @@
 
     - conditional-step:
         condition-kind: boolean-expression
-        condition-expression: $PREPARE_SLAVE
+        condition-expression: $PREPARE_SWARM
         on-evaluation-failure: dont-run
         steps:
         - trigger-builds:
@@ -41,10 +45,24 @@
         name: 'Run system tests'
         condition: COMPLETED
         projects:
-        - name: '9.x.bvt_2'
+        - name: '9.x.prepare_release'
+          current-parameters: true
+          kill-phase-on: NEVER
+        - name: '9.x.setup'
           current-parameters: true
           kill-phase-on: NEVER
 
+    - conditional-step:
+        condition-kind: boolean-expression
+        condition-expression: $CLEANUP_SWARM
+        on-evaluation-failure: dont-run
+        steps:
+        - trigger-builds:
+            - project: "delete-heat-stack"
+              predefined-parameters: |
+                STACK_PREFIX=${STACK_PREFIX}
+              block: true
+
     publishers:
     - description-setter:
         regexp: "'Description string: (.*)'"

diff --git a/maintenance-ci/mos/jobs/9.x.swarm.tests.yaml b/maintenance-ci/mos/jobs/9.x.swarm.tests.yaml
index b07c1e893db492485941e75eee945748e9fda0cf..f81c296779142f011b7d09a22c763ca5d536cdf8 100644 (file)
--- a/maintenance-ci/mos/jobs/9.x.swarm.tests.yaml
+++ b/maintenance-ci/mos/jobs/9.x.swarm.tests.yaml
@@ -1,14 +1,12 @@
 - project:
     name: '9.x swarm tests'
-    swarm-test/repobranch: 'origin/stable/mitaka'
-    swarm-test/reponame: 'fuel-qa'
     swarm-test/venvpath: '/home/jenkins/qa-venv-9.x'
     swarm-test/default_pool: '10.109.0.0/16:24'
     description: '9.1 swarm test group' # fixme!
     swarm-test/node: 'mos.fuel.base'
-    swarm-test/timeout: '480'
+    swarm-test/timeout: '600'
 
-    swarm-test/job-weight: '12'
+    swarm-test/job-weight: '11'
 
     swarm-test/logrotate/artifactNumToKeep: 5
 
@@ -16,5 +14,212 @@
 
     jobs:
     - mos/templates/swarm-test:
+        swarm-test/node: "mos.fuel.base"
+        swarm-test/devops-hw-vars: |
+            ADMIN_NODE_CPU=2
+            SLAVE_NODE_CPU=2
+            ADMIN_NODE_MEMORY=4096
+            SLAVE_NODE_MEMORY=4096
         testgroup:
-        - bvt_2
\ No newline at end of file
+        - prepare_release
+        - bvt_2:
+            swarm-test/custom-overrides-plain-properties: ""
+        - jumbo_frames
+        - thread_1
+        - ceph_ha_one_controller:
+            swarm-test/custom-overrides-plain-properties: |
+                KVM_USE=true
+        - one_controller_actions
+        - multirole
+        - thread_7:
+            swarm-test/env-name-suffix: "multirack"
+            swarm-test/custom-overrides-plain-properties: |
+                MULTIPLE_NETWORKS=true
+                FUEL_STATS_ENABLED=true
+        - thread_usb:
+            swarm-test/env-name-suffix: "usb"
+            swarm-test/custom-overrides-plain-properties: |
+                ADMIN_BOOT_DEVICE=usb
+                SHOW_FUELMENU=true
+        - thread_non_func_1
+        - bonding_ha:
+            swarm-test/env-name-suffix: "bond"
+            swarm-test/custom-overrides-plain-properties: |
+                BONDING=true
+        - bonding_ha_one_controller:
+            swarm-test/env-name-suffix: "bond"
+            swarm-test/custom-overrides-plain-properties: |
+                BONDING=true
+        - cluster_actions
+        - cluster_actions_ha
+        - controller_replacement
+        - offloading
+        - filling_root
+        - ha_neutron
+        - ha_neutron_tun
+        - ha_neutron_scale
+        - ha_neutron_public
+        - ha_neutron_destructive
+        - ha_neutron_destructive_vlan
+        - ha_neutron_destructive_vxlan
+        - command_line
+        - logrotate
+        - ha_destructive_ceph_neutron
+        - repeatable_image_based
+        - custom_hostname
+        - repetitive_restart:
+            swarm-test/custom-overrides-plain-properties: |
+                PATCHING_RUN_RALLY=true
+        - ready_node_reinstallation
+        - error_node_reinstallation
+        - bvt_ubuntu_bootstrap
+        - full_cluster_reinstallation
+        - fuel_plugin_reboot
+        - fuel_plugin_vip_reservation
+        - network_templates
+        - reduced_footprint
+        - ironic_deploy_swift:
+            swarm-test/env-name-suffix: "ironic"
+            swarm-test/custom-overrides-plain-properties: |
+                IRONIC_ENABLED=true
+                IRONIC_NODES_COUNT=1
+        - ironic_deploy_ceph:
+            swarm-test/env-name-suffix: "ironic"
+            swarm-test/custom-overrides-plain-properties: |
+                IRONIC_ENABLED=true
+                IRONIC_NODES_COUNT=1
+        - services_reconfiguration_thread_1:
+            swarm-test/custom-overrides-plain-properties: |
+                DISABLE_SSL=true
+        - services_reconfiguration_thread_2:
+            swarm-test/timeout: '840'
+            swarm-test/custom-overrides-plain-properties: |
+                DISABLE_SSL=true
+        - cgroup_ha
+        - multiracks_2:
+            swarm-test/env-name-suffix: "multirack"
+            swarm-test/custom-overrides-plain-properties: |
+                MULTIPLE_NETWORKS=true
+        - support_dpdk:
+            swarm-test/custom-overrides-plain-properties: |
+                KVM_USE=true
+        - custom_graph
+        - support_dpdk_bond:
+            swarm-test/env-name-suffix: "dpdk_bond"
+            swarm-test/custom-overrides-plain-properties: |
+                KVM_USE=true
+                BONDING=true
+        - test_ibp
+        - test_bdd
+        - smoke_test_configdb:
+            swarm-test/custom-overrides-plain-properties: |
+                PERESTROIKA_REPO=http://perestroika-repo-tst.infra.mirantis.net/mos-repos/centos/mos-master-centos7/os/x86_64/
+        - unlock_settings_tab_states
+        - unlock_settings_tab:
+            swarm-test/timeout: '1200'
+        - public_api:
+            swarm-test/env-name-suffix: "dmz"
+            swarm-test/custom-overrides-plain-properties: |
+                ENABLE_DMZ=true
+        - env_customizations_check
+        - graph_extension
+        - add_updated_node_to_environment:
+            swarm-test/custom-overrides-plain-properties: |
+                FUEL_RELEASE_VERSION=9.0
+                UPDATE_MASTER=False
+                FORCE_DISABLE_UPDATES=True
+                NODES_COUNT=6
+        # test group below uses only 4 VMs at the same time so there is no need
+        # to put in in huge_systest node
+        - multiqueue_base_check:
+            swarm-test/env-name-suffix: "multiqueue"
+            swarm-test/custom-overrides-plain-properties: |
+              KVM_USE=true
+              SLAVE_NODE_CPU=4
+        - ovs_firewall
+        - ovs_firewall_with_dpdk:
+            swarm-test/custom-overrides-plain-properties: |
+                KVM_USE=true
+        - test_tags
+##########################################
+    - mos/templates/swarm-test:
+        # TODO: HUGE nodes, 8gb ram
+        swarm-test/node: "mos.fuel.huge"
+        swarm-test/job-weight: '23'
+        swarm-test/devops-hw-vars: |
+            ADMIN_NODE_CPU=2
+            SLAVE_NODE_CPU=2
+            ADMIN_NODE_MEMORY=4096
+            SLAVE_NODE_MEMORY=8192
+        testgroup:
+        - setup
+        - thread_3:
+            swarm-test/custom-overrides-plain-properties: |
+                SLAVE_NODE_MEMORY=5632
+        - cic_maintenance_mode:
+            swarm-test/custom-overrides-plain-properties: |
+                SLAVE_NODE_MEMORY=5120
+        - huge_ha_neutron:
+            swarm-test/custom-overrides-plain-properties: |
+                SERVTEST_LOCAL_PATH=/home/jenkins/workspace/cloud-images
+        - services_ha:
+            swarm-test/timeout: '1200'
+            swarm-test/custom-overrides-plain-properties: |
+                KVM_USE=true
+                SERVTEST_LOCAL_PATH=/home/jenkins/workspace/cloud-images
+                EXTERNAL_MONGO_URLS=172.18.184.111,172.18.184.112,172.18.184.127
+                EXTERNAL_MONGO_USER=$EXTERNAL_MONGO_USER
+                EXTERNAL_MONGO_DB_NAME=$EXTERNAL_MONGO_DB_NAME
+                EXTERNAL_MONGO_PASS=$EXTERNAL_MONGO_PASS
+                EXTERNAL_MONGO_REPL_SET=ceilometer
+        - services_ha.ceilometer:
+            swarm-test/timeout: '1200'
+            swarm-test/custom-overrides-plain-properties: |
+                KVM_USE=true
+                SERVTEST_LOCAL_PATH=/home/jenkins/workspace/cloud-images
+                EXTERNAL_MONGO_URLS=172.18.184.111,172.18.184.112,172.18.184.127
+                EXTERNAL_MONGO_USER=$EXTERNAL_MONGO_USER
+                EXTERNAL_MONGO_DB_NAME=$EXTERNAL_MONGO_DB_NAME
+                EXTERNAL_MONGO_PASS=$EXTERNAL_MONGO_PASS
+                EXTERNAL_MONGO_REPL_SET=ceilometer
+        - services_ha_one_controller:
+            swarm-test/timeout: '1200'
+            swarm-test/custom-overrides-plain-properties: |
+                KVM_USE=true
+                SERVTEST_LOCAL_PATH=/home/jenkins/workspace/cloud-images
+                EXTERNAL_MONGO_URLS=172.18.184.111,172.18.184.112,172.18.184.127
+                EXTERNAL_MONGO_USER=$EXTERNAL_MONGO_USER
+                EXTERNAL_MONGO_DB_NAME=$EXTERNAL_MONGO_DB_NAME
+                EXTERNAL_MONGO_PASS=$EXTERNAL_MONGO_PASS
+                EXTERNAL_MONGO_REPL_SET=ceilometer
+        - fuel_master_migrate:
+            swarm-test/env-name-suffix: "master_migrate"
+            swarm-test/custom-overrides-plain-properties: |
+                SLAVE_NODE_CPU=4
+        - numa_cpu_pinning:
+            swarm-test/timeout: '600'
+            swarm-test/env-name-suffix: "numa_nodes"
+            swarm-test/custom-overrides-plain-properties: |
+                KVM_USE=true
+                SLAVE_NODE_CPU=6
+                DRIVER_ENABLE_ACPI=true
+                NUMA_NODES=2
+        - deploy_multipath:
+            swarm-test/env-name-suffix: "multipath"
+            swarm-test/custom-overrides-plain-properties: |
+                MULTIPATH=True
+                SLAVE_MULTIPATH_DISKS_COUNT=2
+                SLAVE_NODE_CPU=4
+                DEVOPS_SETTINGS_TEMPLATE=$WORKSPACE/system_test/tests_templates/tests_configs/multipath_3_nodes.yaml
+                NODES_COUNT=4
+                NODE_VOLUME_SIZE=40
+        - support_hugepages:
+            swarm-test/env-name-suffix: "hugepages"
+            swarm-test/custom-overrides-plain-properties: |
+                KVM_USE=True
+                DRIVER_ENABLE_ACPI=true
+                NUMA_NODES=2
+                SLAVE_NODE_CPU=4
+                ENV_SLAVE_LOGIN=root
+                ENV_SLAVE_PASSWORD=r00tme
+                # SLAVE_NODE_MEMORY=5120

diff --git a/maintenance-ci/mos/jobs/9.x.test-reports.yaml b/maintenance-ci/mos/jobs/9.x.test-reports.yaml
index 28ccdad0ad4644b328748da8910ae3cc3b83028e..e4ce62661b1ece8c0da27b5e84e222cd329b67cb 100644 (file)
--- a/maintenance-ci/mos/jobs/9.x.test-reports.yaml
+++ b/maintenance-ci/mos/jobs/9.x.test-reports.yaml
@@ -4,7 +4,7 @@
     testrail_reporter/logrotate/artifactNumToKeep: -1
     testrail_reporter/logrotate/daysToKeep: 90
     testrail_reporter/logrotate/numToKeep: 100
-    testrail_reporter/node: 'mos.fuel.base'
+    testrail_reporter/node: 'jenkins-master'
 
     jobs:
     - mos/templates/test-report-9.x:

diff --git a/maintenance-ci/mos/macroses/9x-systest-params.yaml b/maintenance-ci/mos/macroses/9x-systest-params.yaml
index 182170f8dd99188163739e582694ef769f0fcc23..e3a2764120afec65fca4173a02c2484cca3d288a 100644 (file)
--- a/maintenance-ci/mos/macroses/9x-systest-params.yaml
+++ b/maintenance-ci/mos/macroses/9x-systest-params.yaml
@@ -2,10 +2,6 @@
     name: 9x-systest-params
 
     parameters:
-    - label:
-        name: NODE_LABELS
-        desctiption: "Label where to run job; node name are acceptable too"
-        default: '{swarm-test/node}'
     - bool:
         name: DELETE_ENV_BEFORE_RUN
         default: false

diff --git a/maintenance-ci/mos/scripts/fuel_qa_launch_test.sh b/maintenance-ci/mos/scripts/fuel_qa_launch_test.sh
index 99359269364d0df3e5530b7c0a3bfb40903f0503..bcf4dd13945382077cd7ca36f59a5d93c0dc8ffc 100644 (file)
--- a/maintenance-ci/mos/scripts/fuel_qa_launch_test.sh
+++ b/maintenance-ci/mos/scripts/fuel_qa_launch_test.sh
@@ -8,6 +8,9 @@ rm -rf logs/*
 # for cloud-based testing we will use "one OS instance - one devops lab"
 # in this case we want to use the same ENV_NAME without additions like BUILD_ID
 export ENV_NAME="9.x_virtual_lab"
+if [[ ! -z "${ENV_NAME_SUFFIX}" ]] ; then
+ENV_NAME="${ENV_NAME}.${ENV_NAME_SUFFIX}"
+fi
 echo "ENV_NAME=${ENV_NAME}" > ${WORKSPACE}/${DOS_ENV_NAME_PROPS_FILE:=.dos_environment_name}
 export ISO_PATH=$(seedclient-wrapper -d -m "${MAGNET_LINK?}" -v --force-set-symlink -o "${WORKSPACE?}")
 export MAKE_SNAPSHOT=${MAKE_SNAPSHOT:-false}

diff --git a/maintenance-ci/mos/scripts/testrail-report-9.x.sh b/maintenance-ci/mos/scripts/testrail-report-9.x.sh
index 8715fb25990212327d0b49f3b3deceb3301511cd..92fdab7c66bdcd3c2cbed1e81a0e9133a80ccc51 100644 (file)
--- a/maintenance-ci/mos/scripts/testrail-report-9.x.sh
+++ b/maintenance-ci/mos/scripts/testrail-report-9.x.sh
@@ -11,7 +11,7 @@ export TESTRAIL_URL="https://mirantis.testrail.com"
 
 # Prepare venv
 source "${VENV_PATH}/bin/activate"
- pip install -U -r fuelweb_test/requirements.txt > logs/pip_install_output.log
+# pip install -U -r fuelweb_test/requirements.txt > logs/pip_install_output.log
  export PYTHONPATH="$(pwd):$PYTHONPATH"
 
 # Report tests results from swarm (Ubuntu)

diff --git a/maintenance-ci/mos/scripts/testrail-upload-cases-9.x.sh b/maintenance-ci/mos/scripts/testrail-upload-cases-9.x.sh
index 9ae7d3281dccdcb6f02ee7d154ca48131c9f6581..fb98f8902d7652ee710abe89bbf1c045b8895333 100644 (file)
--- a/maintenance-ci/mos/scripts/testrail-upload-cases-9.x.sh
+++ b/maintenance-ci/mos/scripts/testrail-upload-cases-9.x.sh
@@ -10,7 +10,7 @@ export TESTRAIL_URL="https://mirantis.testrail.com"
 
 # Prepare venv
 source "${VENV_PATH}/bin/activate"
- pip install -U -r fuelweb_test/requirements.txt > logs/pip_install_output.log
+# pip install -U -r fuelweb_test/requirements.txt > logs/pip_install_output.log
  export PYTHONPATH="$(pwd):$PYTHONPATH"
  # will be available after putting whole swarm to regular runner
  python fuelweb_test/testrail/upload_cases_description.py -v -j "${TESTS_RUNNER}" || true

diff --git a/maintenance-ci/mos/templates/swarm-test.yaml b/maintenance-ci/mos/templates/swarm-test.yaml
index e277971707e4b7329a02feb91cef5a69ca9766a6..b1c863f760312c9372ccb68ccb11e9ff8375d744 100644 (file)
--- a/maintenance-ci/mos/templates/swarm-test.yaml
+++ b/maintenance-ci/mos/templates/swarm-test.yaml
@@ -3,14 +3,17 @@
     id: mos/templates/swarm-test
 
     swarm-test/node: 'mos.fuel.base'
-    swarm-test/weight: '7'
+    swarm-test/job-weight: '7'
 
     swarm-test/venvpath: '/home/jenkins/qa-venv-9.x'
 
     swarm-test/custom-overrides-plain-properties: ''
     swarm-test/custom-overrides-properties-file: ''
-    swarm-test/timeout: '180'
+    swarm-test/timeout: '480'
     swarm-test/make-snapshot: 'false'
+    swarm-test/repobranch: 'origin/stable/mitaka'
+    swarm-test/reponame: 'fuel-qa'
+    swarm-test/env-name-suffix: ''
 
     swarm-test/build-discarder/artifactDaysToKeep: -1
     swarm-test/build-discarder/artifactNumToKeep: -1
@@ -18,7 +21,7 @@
     swarm-test/build-discarder/numToKeep: 20
 
     description: 'Run Swarm Test {testgroup}'
-    node: '{swarm-test/node}'
+#    node: '{swarm-test/node}'
     concurrent: true
 
     build-discarder:
@@ -28,6 +31,14 @@
         numToKeep: '{swarm-test/build-discarder/numToKeep}'
 
     parameters:
+    - label:
+        name: NODE_LABEL
+        desctiption: "Label where to run job; node name are acceptable too"
+        default: '{swarm-test/node}'
+    - string:
+        name: ENV_NAME_SUFFIX
+        default: "{swarm-test/env-name-suffix}"
+        description: "Suffix to add to ENV_NAME"
     - 9x-systest-params
     - text:
         name: EXTRA_OPTS
@@ -59,11 +70,7 @@
           TEST_GROUP={testgroup}
           VENV_PATH={swarm-test/venvpath}
           MAKE_SNAPSHOT={swarm-test/make-snapshot}
-          SLAVE_NODE_MEMORY=4096
-          SLAVE_NODE_CPU=2
-          ADMIN_NODE_MEMORY=4096
-          ADMIN_NODE_CPU=2
-
+          {swarm-test/devops-hw-vars}
     - inject: # Overrides
         properties-content: '{swarm-test/custom-overrides-plain-properties}'
     - inject-text-parameter:

diff --git a/maintenance-ci/tox.ini b/maintenance-ci/tox.ini
index 35dd3c4d50555f48f3cbd85a215e562c92056b97..054bfdf77fae427897ab71dc0b6560c89261a491 100644 (file)
--- a/maintenance-ci/tox.ini
+++ b/maintenance-ci/tox.ini
@@ -13,6 +13,6 @@ commands =
        jenkins-jobs --conf conf/jenkins_job.ini.example test -x common/data common:mos:mcp -o {toxinidir}/output/jobs --config-xml
 
 [testenv:views]
-deps = -r{toxinidir}/conf/requirements-views.txt
+deps = -r{toxinidir}/conf/requirements-jobs.txt
 commands =
-       /bin/bash -c 'jenkins-view-builder test views/* -o {toxinidir}/output/views/patching-ci'
+       jenkins-jobs --conf conf/jenkins_job.ini.example test -x common/data views -o {toxinidir}/output/views --config-xml

diff --git a/maintenance-ci/views/9.x.tempest.yaml b/maintenance-ci/views/9.x.tempest.yaml
index 7112fddc915ea6c63d048abdcf6c302ea5da3dc8..cf2f4c8cda7d6edfb6682b1a7d53e696ace17a52 100644 (file)
--- a/maintenance-ci/views/9.x.tempest.yaml
+++ b/maintenance-ci/views/9.x.tempest.yaml
@@ -7,12 +7,12 @@
 #      - maintenance-tempest-reports-Testrail
 #      - maintenance-tempest-runner
     columns:
-      - status
-      - weather
-      - job
-      - last_success
-      - last_failure
-      - last_duration
-      - build_button
+        - status
+        - weather
+        - job
+        - last-success
+        - last-failure
+        - last-duration
+        - build-button
     recurse: False
 

diff --git a/maintenance-ci/views/9.x.yaml b/maintenance-ci/views/9.x.yaml
index 3e42384231c7a4c420b636609bfc6eb4716e0f53..ad3d80d632163e3ccf911f12a8d5aa37197dfaa6 100644 (file)
--- a/maintenance-ci/views/9.x.yaml
+++ b/maintenance-ci/views/9.x.yaml
@@ -1,7 +1,7 @@
 - view:
-  type: list
-  name: '9.x'
-  regex: '9.x.*'
+    type: list
+    name: '9.x'
+    regex: '9.x.*'
 #  jobs:
 #  - 9.x.snapshot.params
 #  - 9.x.swarm.runner
@@ -11,13 +11,13 @@
 #  - 9.x.backup-restore.test-reports
 #  - 9.x.baremetal.test-reports
 #  - 9.0.proposed-to-updates
-  columns:
-  - status
-  - weather
-  - job
-  - last_success
-  - last_failure
-  - last_duration
-  - build_button
-  recurse: False
+    columns:
+        - status
+        - weather
+        - job
+        - last-success
+        - last-failure
+        - last-duration
+        - build-button
+    recurse: False