Revision 2afd10bf

b/ci/ci_squeeze.conf
60 60
[Burnin]
61 61
# Maybe add some burnin options
62 62
# (e.g. tests to run/ignore, timeouts etc)
63
cmd_options = --nofailfast --no-ipv6 --action-timeout=240
63
cmd_options = --images "name:.*" --flavors "name:C1R1...D5.*"
64
# Kamaki version to be used (leave empty for default)
65
# In some cases there is the need for a specific version
66
# of kamaki to be used.
67
kamaki_version = 0.11next-1811-197b413
64 68

  
65 69

  
66 70
[Unit Tests]
b/ci/ci_wheezy.conf
60 60
[Burnin]
61 61
# Maybe add some burnin options
62 62
# (e.g. tests to run/ignore, timeouts etc)
63
cmd_options = --nofailfast --no-ipv6 --action-timeout=240
63
cmd_options = --images "name:.*" --flavors "name:C1R1...D5.*"
64
# Kamaki version to be used (leave empty for default)
65
# In some cases there is the need for a specific version
66
# of kamaki to be used.
67
kamaki_version = 0.11next-1811-197b413
64 68

  
65 69

  
66 70
[Unit Tests]
b/ci/utils.py
731 731
    def build_packages(self):
732 732
        """Build packages needed by Synnefo software"""
733 733
        self.logger.info("Install development packages")
734
        kamaki_version = self.config.get('Burnin', 'kamaki_version')
734 735
        cmd = """
735 736
        apt-get update
736 737
        apt-get install zlib1g-dev dpkg-dev debhelper git-buildpackage \
737 738
                python-dev python-all python-pip ant --yes --force-yes
738
        pip install -U devflow
739
        """
739
        pip install -U devflow kamaki{0}
740
        """.format(("==" + kamaki_version) if kamaki_version else "")
740 741
        _run(cmd, False)
741 742

  
742 743
        # Patch pydist bug
......
881 882
        token=$(grep -e '^token =' .kamakirc | cut -d' ' -f3)
882 883
        images_user=$(kamaki image list -l | grep owner | \
883 884
                      cut -d':' -f2 | tr -d ' ')
884
        snf-burnin --auth-url=$auth_url --token=$token \
885
            --force-flavor=2 --image-id=all \
886
            --system-images-user=$images_user \
887
            {0}
885
        snf-burnin --auth-url=$auth_url --token=$token {0}
888 886
        BurninExitStatus=$?
889
        log_folder=$(ls -1d /var/log/burnin/* | tail -n1)
890
        for i in $(ls $log_folder/*/details*); do
891
            echo -e "\\n\\n"
892
            echo -e "***** $i\\n"
893
            cat $i
894
        done
895 887
        exit $BurninExitStatus
896 888
        """.format(self.config.get('Burnin', 'cmd_options'))
897 889
        _run(cmd, True)
b/snf-tools/synnefo_tools/burnin/common.py
452 452
    """
453 453
    # Initialize logger
454 454
    global logger  # Using global statement. pylint: disable-msg=C0103,W0603
455
    curr_time = datetime.datetime.now()
455 456
    logger = Log(opts.log_folder, verbose=opts.verbose,
456 457
                 use_colors=opts.use_colors, in_parallel=False,
457
                 quiet=opts.quiet)
458
                 quiet=opts.quiet, curr_time=curr_time)
458 459

  
459 460
    # Initialize clients
460 461
    Clients.auth_url = opts.auth_url
......
470 471
    BurninTests.images = opts.images
471 472
    BurninTests.delete_stale = opts.delete_stale
472 473
    BurninTests.run_id = SNF_TEST_PREFIX + \
473
        datetime.datetime.strftime(datetime.datetime.now(), "%Y%m%d%H%M%S")
474
        datetime.datetime.strftime(curr_time, "%Y%m%d%H%M%S")
474 475

  
475 476
    # Choose tests to run
476 477
    if opts.show_stale:
b/snf-tools/synnefo_tools/burnin/logger.py
212 212
    # ----------------------------------
213 213
    # Too many arguments. pylint: disable-msg=R0913
214 214
    def __init__(self, output_dir, verbose=1, use_colors=True,
215
                 in_parallel=False, quiet=False):
215
                 in_parallel=False, quiet=False, curr_time=None):
216 216
        """Initialize our loggers
217 217

  
218 218
        The file to be used by our file logger will be created inside
......
252 252
                sys.stderr.write(msg)
253 253
                sys.exit("Failed to create log folder")
254 254

  
255
        if curr_time is None:
256
            curr_time = datetime.datetime.now()
255 257
        timestamp = datetime.datetime.strftime(
256
            datetime.datetime.now(), "%Y%m%d%H%M%S (%a %b %d %Y %H:%M)")
258
            curr_time, "%Y%m%d%H%M%S (%a %b %d %Y %H:%M)")
257 259
        file_name = timestamp + ".log"
258 260
        self.file_location = os.path.join(output_dir, file_name)
259 261

  
260
        timestamp = datetime.datetime.strftime(
261
            datetime.datetime.now(), "%a %b %d %Y %H:%M")
262
        self._write_to_stdout(None, "Starting burnin (%s)\n" % timestamp)
262
        self._write_to_stdout(None, "Starting burnin with id %s\n" % timestamp)
263 263

  
264 264
        # Create the logging file
265 265
        self._create_logging_file(timestamp)

Also available in: Unified diff