diff options
| -rw-r--r-- | jjb/infra/infra-daily-jobs.yml | 4 | ||||
| -rw-r--r-- | prototypes/puppet-infracloud/hiera/common.yaml | 2 | ||||
| -rwxr-xr-x | utils/lab-reconfiguration/reconfigUcsNet.py | 2 | ||||
| -rwxr-xr-x | utils/test/reporting/functest/reporting-status.py | 2 | ||||
| -rw-r--r-- | utils/test/reporting/yardstick/reporting-status.py | 10 |
5 files changed, 13 insertions, 7 deletions
diff --git a/jjb/infra/infra-daily-jobs.yml b/jjb/infra/infra-daily-jobs.yml index df90c6d13..d779d56d5 100644 --- a/jjb/infra/infra-daily-jobs.yml +++ b/jjb/infra/infra-daily-jobs.yml @@ -156,11 +156,11 @@ - shell: | #!/bin/bash - echo "Not activated!" + sudo $WORKSPACE/jjb/infra/infra-deploy.sh - builder: name: 'infra-smoketest-daily-builder' builders: - shell: | #!/bin/bash - echo "Not activated!" + sudo $WORKSPACE/jjb/infra/infra-smoketest.sh diff --git a/prototypes/puppet-infracloud/hiera/common.yaml b/prototypes/puppet-infracloud/hiera/common.yaml index 7d6b44063..1fcde2f75 100644 --- a/prototypes/puppet-infracloud/hiera/common.yaml +++ b/prototypes/puppet-infracloud/hiera/common.yaml @@ -76,5 +76,5 @@ hosts: compute00.opnfvlocal: ip: 192.168.122.4 -# br-eth0 for debian, br-ens3 for RHEL +# br-eth0 for debian, br_ens3 for RHEL bridge_name: br-eth0 diff --git a/utils/lab-reconfiguration/reconfigUcsNet.py b/utils/lab-reconfiguration/reconfigUcsNet.py index 45a72a398..4c08f3dc9 100755 --- a/utils/lab-reconfiguration/reconfigUcsNet.py +++ b/utils/lab-reconfiguration/reconfigUcsNet.py @@ -157,7 +157,7 @@ def read_yaml_file(yamlFile): """ # TODO: add check if vnic templates specified in file exist on UCS with open(yamlFile, 'r') as stream: - return yaml.load(stream) + return yaml.safe_load(stream) def set_network(handle=None, yamlFile=None): diff --git a/utils/test/reporting/functest/reporting-status.py b/utils/test/reporting/functest/reporting-status.py index e9e167d16..0b80fe49a 100755 --- a/utils/test/reporting/functest/reporting-status.py +++ b/utils/test/reporting/functest/reporting-status.py @@ -34,7 +34,7 @@ tempest = tc.TestCase("tempest_smoke_serial", "functest", -1) cf = conf.TEST_CONF response = requests.get(cf) -functest_yaml_config = yaml.load(response.text) +functest_yaml_config = yaml.safe_load(response.text) logger.info("*******************************************") logger.info("* Generating reporting scenario status *") diff --git a/utils/test/reporting/yardstick/reporting-status.py b/utils/test/reporting/yardstick/reporting-status.py index 546bf08c4..d7a4e2986 100644 --- a/utils/test/reporting/yardstick/reporting-status.py +++ b/utils/test/reporting/yardstick/reporting-status.py @@ -32,6 +32,12 @@ for version in conf.versions: for installer in conf.installers: # get scenarios results data scenario_results = utils.getScenarioStatus(installer, version) + if 'colorado' == version: + stable_result = utils.getScenarioStatus(installer, 'stable/colorado') + for k,v in stable_result.items(): + if not scenario_results.has_key(k): + scenario_results[k] = [] + scenario_results[k] += stable_result[k] scenario_result_criteria = {} # From each scenarios get results list @@ -44,10 +50,10 @@ for version in conf.versions: scenario_score = 0 for v in s_result: - if v['details'] == 'SUCCESS': + if v['criteria'] == 'SUCCESS': scenario_score += 1 - if scenario_score == scenario_criteria: + if scenario_score == scenario_criteria and scenario_criteria == 4: s_status = 'OK' logger.info(">>>>> scenario OK, save the information") else: |