teuthology 1.2.0__tar.gz → 1.2.2__tar.gz

teuthology-1.2.2/.github/CODEOWNERS

@@ -0,0 +1 @@
+* @ceph/teuthology

{teuthology-1.2.0 → teuthology-1.2.2}/.github/workflows/ci.yml

@@ -13,8 +13,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: ubuntu-20.04
-            python: "3.10"
           - os: ubuntu-22.04
             python: "3.10"
           - os: ubuntu-22.04
@@ -23,9 +21,6 @@ jobs:
             python: "3.12"
     steps:
       - uses: actions/checkout@v4
-      - name: Add deadsnakes PPA
-        if: matrix.os == 'ubuntu-20.04'
-        run: sudo add-apt-repository --yes ppa:deadsnakes/ppa
       - name: Setup Python
         uses: actions/setup-python@v5
         with:

{teuthology-1.2.0 → teuthology-1.2.2}/.github/workflows/dependencies.yml

@@ -13,16 +13,11 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: ubuntu-20.04
-            python: "3.10"
           - os: ubuntu-22.04
             python: "3.10"
           - os: ubuntu-22.04
             python: "3.11"
     steps:
-      - name: Add deadsnakes PPA
-        if: matrix.os == 'ubuntu-20.04'
-        run: sudo add-apt-repository --yes ppa:deadsnakes/ppa
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
@@ -39,6 +34,10 @@ jobs:
           cd ./virtualenv/lib/python*
           touch no-global-site-packages.txt
         working-directory: ./teuthology
+      - name: Refresh system repos
+        run: |
+          sudo apt update -y
+          sudo apt upgrade -y
       - name: Initial bootstrap
         run: ./bootstrap install
         working-directory: ./teuthology

{teuthology-1.2.0 → teuthology-1.2.2}/.github/workflows/dev_container.yml

@@ -2,36 +2,41 @@
 name: dev_container
 on:
   push:
+    branches:
+      - "main"
+  pull_request:
     branches:
       - main
   workflow_dispatch:
 
 jobs:
   docker:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-24.04
+            python: "3.12"
+          - os: ubuntu-24.04-arm
+            python: "3.12"
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
       - name: Login to Quay.io
-        uses: docker/login-action@v3
+        if: github.event_name == 'push' && github.ref_name == 'main'
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772
         with:
           registry: quay.io
           username: ${{ secrets.QUAY_USERNAME }}
           password: ${{ secrets.QUAY_ROBOT_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4
         env:
           QUAY_URI: quay.io/ceph-infra/teuthology-dev
           QUAY_TAG: ${{ github.event_name == 'pull_request' && github.head_ref || github.ref_name }}
         with:
           context: .
           file: containers/teuthology-dev/Dockerfile
-          platforms: linux/amd64,linux/arm64
-          push: true
+          push: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
           tags: ${{ env.QUAY_URI }}:${{ env.QUAY_TAG }}
           outputs: type=image,name=target
-

teuthology-1.2.2/.github/workflows/integration.yml

@@ -0,0 +1,33 @@
+name: integration
+on:
+  pull_request:
+  workflow_dispatch:
+jobs:
+  test:
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v4
+      - name: Make archive directory
+        run: mkdir /tmp/archive_dir
+      - name: Test using docker-compose
+        run: ./start.sh
+        working-directory: ./docs/docker-compose
+      - name: Rename Directory
+        # Replace ":" with "_" everywhere in directory path.
+        # This needs to be done because GA does not support ":" colon character in artifacts (like in /root-2025-03-06_18:47:26-teuthology:no-ceph-main-distro-default-testnode).
+        # Invalid characters include:  Double quote ", Colon :, Less than <, Greater than >, Vertical bar |, Asterisk *, Question mark ?, Carriage return \r, Line feed \n
+        if: always()
+        run: |
+          for DIR in /tmp/archive_dir/root-*; do
+            SAFE_DIR="${DIR//:/_}"   # Replace in '/tmp/archive_dir/root-2025-03-06_18:47:26-teuthology:no-ceph-main-distro-default-testnode'
+            if [ "$DIR" != "$SAFE_DIR" ]; then
+              mv "$DIR" "$SAFE_DIR"
+            fi
+          done
+      - name: Upload teuthology archive logs 
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: teuthology-logs 
+          path: |
+            /tmp/archive_dir/*

{teuthology-1.2.0 → teuthology-1.2.2}/PKG-INFO

@@ -1,9 +1,9 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: teuthology
-Version: 1.2.0
+Version: 1.2.2
 Summary: Ceph test framework
 Home-page: https://github.com/ceph/teuthology
-Author: Ceph Community
+Author: Red Hat, Inc.
 License: MIT
 Keywords: teuthology,test,ceph,cluster
 Classifier: Intended Audience :: Developers
@@ -24,21 +24,21 @@ Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: PyYAML
-Requires-Dist: ansible-core==2.16.6
+Requires-Dist: ansible-core==2.17.7
 Requires-Dist: apache-libcloud
 Requires-Dist: backports.ssl-match-hostname
 Requires-Dist: beanstalkc3>=0.4.0
 Requires-Dist: configobj
 Requires-Dist: configparser
-Requires-Dist: cryptography==41.0.7
 Requires-Dist: docopt
-Requires-Dist: gevent
+Requires-Dist: gevent<25
 Requires-Dist: httplib2
 Requires-Dist: humanfriendly
 Requires-Dist: lupa
 Requires-Dist: lxml
 Requires-Dist: ndg-httpsclient
 Requires-Dist: netaddr
+Requires-Dist: openstacksdk
 Requires-Dist: paramiko
 Requires-Dist: pexpect
 Requires-Dist: pip-tools
@@ -75,6 +75,7 @@ Requires-Dist: xmltodict; extra == "test"
 Provides-Extra: openstack
 Requires-Dist: python-openstackclient; extra == "openstack"
 Requires-Dist: python-novaclient; extra == "openstack"
+Dynamic: license-file
 
 ===================================================
 `Teuthology` -- The Ceph integration test framework

teuthology-1.2.2/bootstrap

@@ -0,0 +1,159 @@
+#!/bin/bash
+set -e
+if [ $# -eq 0 ]; then
+  install=false
+else
+  if [ "$1" = "install" ]; then
+      install=true
+  else
+      echo "Invalid command, supported commands are: 'install'"
+      exit 1
+  fi
+fi
+
+if [[ "$PYTHON" =~ "python2" ]]; then
+    echo "python2 is not supported." >&2
+    exit 1
+fi
+
+# Use the newest version we find
+if [ -z "$PYTHON" ]; then
+  for i in 12 11 10; do
+    command -v "python3.$i" && PYTHON="python3.$i" &>/dev/null && break
+  done
+fi
+if [ -z "$PYTHON" ]; then
+  # This would be bizarre, but I suppose possible
+  PYTHON=${PYTHON:-"python3"}
+fi
+echo "Using python: $PYTHON"
+
+case "$(uname -s)" in
+Linux)
+    if command -v lsb_release; then
+        OS=$(lsb_release --id --short)
+    else
+        . /etc/os-release
+        OS=$(echo $NAME | tr -d ' ')
+    fi
+    # rpm/dnf is the default, to reduce repetition in the case statement
+    has_pkg="rpm -q --whatprovides"
+    install_pkg="sudo dnf install -y"
+    case "$OS" in
+    Ubuntu|Debian|LinuxMint)
+        deps=(qemu-utils python3-dev libssl-dev python3-pip python3-wheel python3-venv libev-dev libvirt-dev libffi-dev libyaml-dev build-essential jq curl)
+        has_pkg="dpkg -s"
+        install_pkg="sudo apt install -y"
+        ;;
+    RedHatEnterpriseWorkstation|RedHatEnterpriseServer|RedHatEnterprise|CentOS)
+        deps=(python39-pip python39-devel mariadb-devel libev-devel libvirt-devel libffi-devel)
+        ;;
+    CentOSStream)
+        PYTHON=python3.12
+        deps=($PYTHON-pip $PYTHON-devel)
+        ;;
+    AlmaLinux|RockyLinux)
+        PYTHON=python3.12
+        deps=($PYTHON-pip $PYTHON-devel libev-devel libvirt-devel libffi-devel)
+        ;;
+    Fedora|FedoraLinux)
+        deps=($PYTHON-pip $PYTHON-devel libev-devel libvirt-devel libffi-devel)
+        ;;
+    "openSUSE project"|"SUSE LINUX"|"openSUSE"|"openSUSELeap"|"openSUSETumbleweed")
+        PYTHON=python3.12
+        deps=(python312-pip python312-devel python312 libev-devel libvirt-devel libffi-devel)
+        install_pkg="sudo zypper install"
+        ;;
+    esac
+    ;;
+
+Darwin)
+    deps="python libvirt libev libffi"
+    has_pkg="brew list"
+    install_pkg="brew install"
+    ;;
+esac
+for package in ${deps[@]}; do
+    if ! $has_pkg $package &>/dev/null; then
+        # add a space after old values
+        missing="${missing:+$missing }$package"
+        echo missing=${missing}
+    fi
+done
+if [ -n "$missing" ]; then
+    echo "$0: missing required packages:" 1>&2
+    echo "$missing"
+    if [ "$install" = true ]; then
+        echo "Installing missing packages..."
+        $install_pkg $missing
+    else
+        echo "Please install missing packages or run './bootstrap install'"
+        echo "$install_pkg $missing"
+        exit 1
+    fi
+    fi
+
+PYTHON_BIN=$(command -v $PYTHON)
+if [ -z $PYTHON_BIN -o ! -e $PYTHON_BIN -o ! -x $PYTHON_BIN ]; then
+  echo "Cannot find $PYTHON!"
+  exit 1
+fi
+PYTHON_VER_OUT=$($PYTHON_BIN --version)
+
+VENV=${VENV:-"./virtualenv"}
+# If the venv was set to use system site-packages, fix that
+if [ -f "$VENV/pyvenv.cfg" ]; then
+    sed -i'' -e 's/\(include-system-site-packages\s*=\s*\)true/\1false/g' $VENV/pyvenv.cfg
+fi
+
+# Attempt to force a UTF-8 locale without being specific to English
+export LANG=${LANG:-C.UTF-8}
+(echo $LANG | grep -qi utf-8) || export LC_ALL=$LANG.UTF-8
+
+if [ -z "$NO_CLOBBER" ] && \
+  [ ! -e "$VENV/bin/pip" -o ! -e "$VENV/bin/$PYTHON" ] || \
+  [ "${PYTHON_VER_OUT}" != "$($VENV/bin/$PYTHON --version)" ] \
+  ; then
+   echo "Deleting existing virtual environment"
+    rm -rf virtualenv
+fi
+
+if [ -z "$NO_CLOBBER" ] || [ ! -e $VENV ]; then
+    echo "Creating new venv at $VENV"
+    $PYTHON_BIN -m venv $VENV
+fi
+
+PY_MAJOR=$($VENV/bin/python -c "import sys; print(sys.version_info[0])")
+PY_MINOR=$($VENV/bin/python -c "import sys; print(sys.version_info[1])")
+
+# Python version check
+if [[ "$PY_MAJOR" -ne 3 || "$PY_MINOR" -lt 10 ]]; then
+    echo "Python version should be 3.10 or higher, found $PY_MAJOR.$PY_MINOR"
+    exit 1
+fi
+
+$VENV/bin/pip install packaging
+
+if [ -f "$VENV/bin/ansible" ]; then
+    uninstall_ansible=$($VENV/bin/python3 -c "import ansible; from packaging.version import parse; print(parse(ansible.__version__) < parse('2.10.0'))")
+    if [ "$uninstall_ansible" = "True" ]; then
+        $VENV/bin/pip uninstall -y ansible
+    fi
+fi
+
+# First, upgrade pip
+$VENV/bin/pip install --upgrade pip
+
+# See https://github.com/pypa/pip/issues/8559
+$VENV/bin/pip install -r requirements.txt --use-pep517
+
+# By default, install teuthology in editable mode
+$VENV/bin/pip install ${PIP_INSTALL_FLAGS:---editable '.[test]'}
+
+# Check to make sure requirements are met
+$VENV/bin/pip check
+
+# Install ansible collections
+$VENV/bin/ansible-galaxy install -r requirements.yml
+
+echo "Bootstrap completed successfully!!!"

{teuthology-1.2.0 → teuthology-1.2.2}/containers/teuthology-dev/.teuthology.yaml

@@ -7,3 +7,8 @@ teuthology_path: /teuthology
 archive_base: /archive_dir
 reserve_machines: 0
 lab_domain: ''
+
+defaults:
+  cephadm:
+    containers:
+      image: 'quay.ceph.io/ceph-ci/ceph'

{teuthology-1.2.0 → teuthology-1.2.2}/containers/teuthology-dev/Dockerfile

@@ -11,6 +11,8 @@ RUN apt-get update && \
     python3-pip \
     python3-venv \
     vim \
+    jq \
+    curl \
     libev-dev \
     libvirt-dev \
     libffi-dev \
@@ -29,6 +31,7 @@ RUN \
     PIP_INSTALL_FLAGS="-r requirements.txt" ./bootstrap
 COPY . /teuthology
 RUN \
+    (git config -f ./.git/config --unset 'http.https://github.com/.extraheader' || true ) && \
     ./bootstrap
 COPY containers/teuthology-dev/containerized_node.yaml /teuthology
 COPY containers/teuthology-dev/.teuthology.yaml /root

{teuthology-1.2.0 → teuthology-1.2.2}/containers/teuthology-dev/containerized_node.yaml

@@ -7,6 +7,5 @@ overrides:
       cm_user: root
       start_rpcbind: false
   cephadm:
-    image: quay.ceph.io/ceph-ci/ceph:main
     osd_method: raw
     no_cgroups_split: true

{teuthology-1.2.0 → teuthology-1.2.2}/docs/LAB_SETUP.rst

@@ -18,7 +18,7 @@ We're currently running both paddles and pulpito on the same node. We have a pro
 
 Do the following as root or as another user with sudo access::
 
-    sudo apt-get install git python-dev python-virtualenv postgresql postgresql-contrib postgresql-server-dev-all supervisor
+    sudo apt-get install git python3-dev python3-virtualenv postgresql postgresql-contrib postgresql-server-dev-all supervisor
     sudo -u postgres createuser paddles -P
     sudo -u postgres createdb paddles
 

{teuthology-1.2.0 → teuthology-1.2.2}/docs/docker-compose/docker-compose.yml

@@ -74,6 +74,8 @@ services:
       TESTNODES:
       TEUTHOLOGY_WAIT:
       TEUTH_BRANCH:
+    volumes:
+      - /tmp/archive_dir:/archive_dir:rw
   testnode:
     build:
       context: ./testnode

{teuthology-1.2.0 → teuthology-1.2.2}/docs/docker-compose/teuthology/Dockerfile

@@ -5,6 +5,8 @@ ENV LANG=C.UTF-8
 RUN apt-get update && \
     apt-get install -y \
     git \
+    jq \
+    curl \
     qemu-utils \
     python3-dev \
     libssl-dev \

{teuthology-1.2.0 → teuthology-1.2.2}/docs/laptop/README.md

@@ -52,7 +52,7 @@ docker network create paddles
 Start postgres containers in order to use paddles:
 
 ```bash
-mkdir $HOME/.teuthology/postgres
+mkdir -p $HOME/.teuthology/postgres
 docker run -d -p 5432:5432 --network paddles --name paddles-postgres \
     -e POSTGRES_PASSWORD=secret \
     -e POSTGRES_USER=paddles \
@@ -61,6 +61,10 @@ docker run -d -p 5432:5432 --network paddles --name paddles-postgres \
     -v $HOME/.teuthology/postgres:/var/lib/postgresql/data postgres
 ```
 
+NOTE. When running container on MacOS X using podman postgres may experience
+troubles with volume directory binds because of podman machine,  thus use regular
+volumes like `-v paddlesdb:/var/lib/postgresql/data`.
+
 ### Run paddles
 
 Checkout paddles and build the image:
@@ -72,12 +76,16 @@ cd ~/paddles && docker build . --file Dockerfile --tag paddles
 Run the container with previously created network:
 
 ```bash
-docker run -d --network paddles --name api -p 80:8080 \
-	-e PADDLES_SERVER_HOST=0.0.0.0 \
-	-e PADDLES_SQLALCHEMY_URL=postgresql+psycopg2://paddles:secret@paddles-postgres/paddles \
-	paddles
+docker run -d --network paddles --name api -p 8080:8080 \
+    -e PADDLES_SERVER_HOST=0.0.0.0 \
+    -e PADDLES_SQLALCHEMY_URL=postgresql+psycopg2://paddles:secret@paddles-postgres/paddles \
+    -e PADDLES_JOB_LOG_HREF_TEMPL='http://localhost:8888/{run_name}/{job_id}/teuthology.log' \
+    paddles
 ```
 
+Note: we provide job log href template here, so the logs can be referenced logs in archive share
+correctly, for details see below in `Run dispatcher` section.
+
 ### Run pulpito
 
 Checkout pulpito and build the image:
@@ -332,7 +340,21 @@ For further usage nodes should be unlocked with `--unlock` option.
 
 ### Run beanstalkd
 
-For openSUSE there is no beanstalkd package as for Ubuntu, so it is needed to add corresponding repo:
+Build and run beanstalkd container.
+```bash
+cd teuthology/beanstalk/alpine &&
+   podman build . --file Dockerfile --tag beanstalkd
+
+podman run -d --network paddles --name queue -p 11300:11300 beanstalkd
+```
+
+
+
+Alternatively, beanstalkd can be installed as a service.
+
+Note:
+For openSUSE there is no beanstalkd package as for Ubuntu, so it is needed
+to add corresponding repo:
 
 ```bash
 zypper addrepo https://download.opensuse.org/repositories/filesystems:/ceph:/teuthology/openSUSE_Leap_15.2/x86_64/ teuthology && zypper ref
@@ -345,21 +367,26 @@ sudo zypper in beanstalkd
 sudo service beanstalkd start
 ```
 
-### Run worker
+### Run dispatcher
 
-Create archive and worker log directories and run the worker polling required tube.
+Create and share archive directory.
 
 ```bash
-TEUTH_HOME=$HOME/.teuthology
-mkdir -p $TEUTH_HOME/www/logs/jobs
-mkdir -p $TEUTH_HOME/www/logs/workers
+mkdir -p ~/.teuthology/archive
 
-teuthology-worker -v --tube vps --archive-dir $TEUTH_HOME/www/logs/jobs --log-dir $TEUTH_HOME/www/logs/workers
+podman run --name archive -v $HOME/.teuthology/archive:/usr/local/apache2/htdocs/ -d -p 8888:80 httpd:2.4
+```
+
+Run teuthology dispatcher against 'vps' machine type.
+
+```bash
+mkdir -p ~/.teuthology/dispatcher
+teuthology-dispatcher -v -a ~/.teuthology/archive -t vps -l ~/.teuthology/dispatcher
 ```
 
 Schedule a dummy job:
 ```bash
-teuthology-suite -v --ceph-repo https://github.com/ceph/ceph --suite-repo https://github.com/ceph/ceph --ceph octopus --suite dummy -d centos -D 8.2 --sha1 35adebe94e8b0a17e7b56379a8bf24e5f7b8ced4 --limit 1 -m vps -t refs/pull/1548/merge
+teuthology-suite -v --ceph-repo https://github.com/ceph/ceph --suite-repo https://github.com/ceph/ceph --ceph main --suite dummy -d ubuntu --sha1 35adebe94e8b0a17e7b56379a8bf24e5f7b8ced4 --limit 1 -m vps -t refs/pull/2023/merge
 ```
 
 ## Downburst
@@ -396,13 +423,7 @@ sha512sum opensuse-tumbleweed-20200810-cloudimg-amd64.img | cut -d' ' -f1 > open
 run webserver localy:
 
 ```bash
-(cd $TEUTH_HOME/www && python -m SimpleHTTPServer 8181)
-```
-
-or
-
-```bash
-(cd $TEUTH_HOME/www && python3 -m http.server 8181)
+podman run --name downburst-discovery -v $HOME/.teuthology/www:/usr/local/apache2/htdocs/ -d -p 8181:80 httpd:2.4
 ```
 
 ```bash

{teuthology-1.2.0 → teuthology-1.2.2}/docs/laptop/targets.sql

@@ -1,9 +1,8 @@
-begin transaction;
+begin;
 insert into nodes (name, machine_type, is_vm, locked, up) values ('localhost', 'libvirt', false, true, true);
 insert into nodes (name, machine_type, is_vm, locked, up, mac_address, vm_host_id) values
 ('target-00.local', 'vps', true, false, false, '52:54:00:00:00:00', (select id from nodes where name='localhost')),
 ('target-01.local', 'vps', true, false, false, '52:54:00:00:00:01', (select id from nodes where name='localhost')),
 ('target-02.local', 'vps', true, false, false, '52:54:00:00:00:02', (select id from nodes where name='localhost')),
 ('target-03.local', 'vps', true, false, false, '52:54:00:00:00:03', (select id from nodes where name='localhost'));
-commit transaction
-
+commit;

{teuthology-1.2.0 → teuthology-1.2.2}/docs/requirements.txt

@@ -1,3 +1,5 @@
 sphinx >= 5.0.0  # for python 3.10
 sphinxcontrib-programoutput
 mock == 2.0.0
+openstacksdk == 4.5.0
+python-openstackclient >= 6.0.0

{teuthology-1.2.0 → teuthology-1.2.2}/docs/siteconfig.rst

@@ -74,6 +74,9 @@ Here is a sample configuration with many of the options set and documented::
     # Where teuthology and ceph-qa-suite repos should be stored locally
     src_base_path: /home/foo/src
 
+    # Where the teuthology git repo is considered to reside.
+    teuthology_git_url: https://github.com/ceph/teuthology.git
+
     # Where teuthology path is located: do not clone if present
     #teuthology_path: .
 

{teuthology-1.2.0 → teuthology-1.2.2}/requirements.txt

@@ -4,7 +4,7 @@
 #
 #    pip-compile --extra=test pyproject.toml
 #
-ansible-core==2.16.6
+ansible-core==2.17.7
     # via teuthology (pyproject.toml)
 apache-libcloud==3.8.0
     # via teuthology (pyproject.toml)
@@ -42,7 +42,7 @@ click==8.1.7
     # via pip-tools
 colorama==0.4.6
     # via tox
-configobj==5.0.8
+configobj==5.0.9
     # via teuthology (pyproject.toml)
 configparser==6.0.0
     # via teuthology (pyproject.toml)
@@ -63,7 +63,7 @@ filelock==3.13.1
     # via
     #   tox
     #   virtualenv
-gevent==23.9.1
+gevent==24.2.1
     # via teuthology (pyproject.toml)
 greenlet==3.0.3
     # via gevent
@@ -77,7 +77,7 @@ iniconfig==2.0.0
     # via pytest
 ipy==1.1
     # via teuthology (pyproject.toml)
-jinja2==3.1.4
+jinja2==3.1.6
     # via ansible-core
 jmespath==1.0.1
     # via
@@ -188,7 +188,7 @@ urllib3==1.26.18
     #   requests
     #   sentry-sdk
     #   teuthology (pyproject.toml)
-virtualenv==20.25.0
+virtualenv==20.26.6
     # via tox
 wcwidth==0.2.12
     # via prettytable
@@ -200,7 +200,9 @@ zope-event==5.0
     # via gevent
 zope-interface==6.1
     # via gevent
-
+openstacksdk==4.5.0
+    # via teuthology (pyproject.toml)
+python-openstackclient>=6.0.0
 # The following packages are considered to be unsafe in a requirements file:
 # pip
 # setuptools

{teuthology-1.2.0 → teuthology-1.2.2}/scripts/node_cleanup.py

@@ -3,14 +3,27 @@ import logging
 import sys
 
 import teuthology
+from teuthology.config import config
 from teuthology.lock import query, ops
 
+
 def main():
     args = parse_args(sys.argv[1:])
     if args.verbose:
         teuthology.log.setLevel(logging.DEBUG)
+    else:
+        teuthology.log.setLevel(100)
     log = logging.getLogger(__name__)
-    stale = query.find_stale_locks(args.owner)
+    logger = logging.getLogger()
+    for handler in logger.handlers:
+        handler.setFormatter(
+            logging.Formatter('%(message)s')
+        )
+    try:
+        stale = query.find_stale_locks(args.owner)
+    except Exception:
+        log.exception(f"Error while check for stale locks held by {args.owner}")
+        return
     if not stale:
         return
     by_owner = {}
@@ -26,10 +39,13 @@ def main():
         log.info("Would attempt to unlock:")
         for owner, nodes in by_owner.items():
             for node in nodes:
-                log.info(f"{node['name']}\t{node['description']}")
+                node_job = node['description'].replace(
+                    config.archive_base, config.results_ui_server)
+                log.info(f"{node['name']}\t{node_job}")
     else:
         for owner, nodes in by_owner.items():
             ops.unlock_safe([node["name"] for node in nodes], owner)
+    log.info(f"unlocked {len(stale)} nodes")
 
 def parse_args(argv):
     parser = argparse.ArgumentParser(

{teuthology-1.2.0 → teuthology-1.2.2}/scripts/suite.py

@@ -77,6 +77,8 @@ Standard arguments:
                               [default: qa]
   --suite-branch <suite_branch>
                               Use this suite branch instead of the ceph branch
+  --suite-sha1 <suite_sha1>   The suite sha1 to use for the tests (overrides
+                              --suite-branch)
   --suite-dir <suite_dir>     Use this alternative directory as-is when
                               assembling jobs from yaml fragments. This causes
                               <suite_branch> to be ignored for scheduling