on:
pull_request:
branches:
- - master
+ - main
workflow_dispatch:
jobs:
- name: Run unit tests
run: tox -e py3
- name: Run docs build
- run: tox -e docs
\ No newline at end of file
+ run: tox -e docs
on:
pull_request:
branches:
- - master
+ - main
workflow_dispatch:
jobs:
- name: Checkout default branch
uses: actions/checkout@v3
with:
- ref: master
+ ref: main
path: teuthology
- name: virtualenv
run: |
paddles
-------
-Follow instructions at https://github.com/ceph/paddles/blob/master/README.rst
+Follow instructions at https://github.com/ceph/paddles/blob/main/README.rst
pulpito
-------
-Follow instructions at https://github.com/ceph/pulpito/blob/master/README.rst
+Follow instructions at https://github.com/ceph/pulpito/blob/main/README.rst
Starting up
As 'teuthology', do the following::
mkdir ~/src
- git clone https://github.com/ceph/teuthology.git src/teuthology_master
- pushd src/teuthology_master/
+ git clone https://github.com/ceph/teuthology.git src/teuthology_main
+ pushd src/teuthology_main/
./bootstrap
popd
As 'teuthworker', do the following::
mkdir ~/src
- git clone https://github.com/ceph/teuthology.git src/teuthology_master
- pushd src/teuthology_master/
+ git clone https://github.com/ceph/teuthology.git src/teuthology_main
+ pushd src/teuthology_main/
./bootstrap
popd
mkdir ~/bin
- wget -O ~/bin/worker_start https://raw.githubusercontent.com/ceph/teuthology/master/docs/_static/worker_start.sh
- echo 'PATH="$HOME/src/teuthology_master/virtualenv/bin:$PATH"' >> ~/.profile
+ wget -O ~/bin/worker_start https://raw.githubusercontent.com/ceph/teuthology/main/docs/_static/worker_start.sh
+ echo 'PATH="$HOME/src/teuthology_main/virtualenv/bin:$PATH"' >> ~/.profile
source ~/.profile
mkdir -p ~/archive/worker_logs
worker_start magna 1
First::
- wget https://raw.githubusercontent.com/ceph/teuthology/master/docs/_static/create_nodes.py
+ wget https://raw.githubusercontent.com/ceph/teuthology/main/docs/_static/create_nodes.py
Edit ``create_nodes.py`` to generate the hostnames of the machines you want to submit to paddles.
bob.smith@foo.com when it's completed. For more details on
``teuthology-suite``, please consult the output of ``teuthology-suite --help``.
Read more about running integration tests using teuthology at `docs.ceph.com
-<http://docs.ceph.com/docs/master/dev/developer_guide/running-tests-using-teuth/>`__.
+<http://docs.ceph.com/docs/main/dev/developer_guide/running-tests-using-teuth/>`__.
In order for a queued task to be run, a teuthworker thread on
``teuthology.front.sepia.ceph.com`` needs to remove the task from the queue.
--teuthology-branch $TEUTHOLOGY_BRANCH \
--ceph-repo https://github.com/ceph/ceph.git \
--suite-repo https://github.com/ceph/ceph.git \
- -c master \
+ -c main \
-m $MACHINE_TYPE \
--limit 1 \
-n 100 \
--suite teuthology:no-ceph \
--filter-out "libcephfs,kclient,stream,centos,rhel" \
-d ubuntu -D 20.04 \
- --suite-branch master \
+ --suite-branch main \
--subset 9000/100000 \
-p 75 \
--seed 349 \
In the abstract, each set of tests is defined by a `suite`. All of our suites
live in the `ceph` git repository in the `qa/suites/ directory
-<https://github.com/ceph/ceph/tree/master/qa/suites/>`__ .
+<https://github.com/ceph/ceph/tree/main/qa/suites/>`__ .
Each subdirectory in `suites` is a suite; they may also have "sub-suites" which
may aid in scheduling, for example, tests for a specific feature.
with what functions each node will perform.
To go into more depth regarding suite design, see the `README
-<https://github.com/ceph/ceph/blob/master/qa/README>`__.
+<https://github.com/ceph/ceph/blob/main/qa/README>`__.
One example of this is the `smoke
-<https://github.com/ceph/ceph/tree/master/qa/suites/smoke>`__ suite.
+<https://github.com/ceph/ceph/tree/main/qa/suites/smoke>`__ suite.
Scheduling
To get a preview of what `teuthology-suite` might do, try::
- teuthology-suite -v -m mira --ceph-repo http://github.com/ceph/ceph.git -c master --suite-repo http://github.com/ceph/ceph.git -s smoke --dry-run
+ teuthology-suite -v -m mira --ceph-repo http://github.com/ceph/ceph.git -c main --suite-repo http://github.com/ceph/ceph.git -s smoke --dry-run
The `-m mira` specifies `mira` as the machine type. Machine types are dependent
on the specific lab in use. The `--ceph-repo http://github.com/ceph/ceph.git`
-specifies from which git repository to pull `-c master`. Similarly,
+specifies from which git repository to pull `-c main`. Similarly,
`--suite-repo` is specifying where to find the QA branch. The default for
`--ceph-repo` and `--suite-repo` is `http://github.com/ceph/ceph-ci.git` which
-is usually what you will want. For `master`, you must always use
+is usually what you will want. For `main`, you must always use
`http://github.com/ceph/ceph.git` as it does not exist on the ceph-ci
repository.
Assuming a build is available, that should pretend to schedule several jobs. If
-it complains about missing packages, try swapping `master` with `jewel` or one
+it complains about missing packages, try swapping `main` with `jewel` or one
of the other Ceph stable branches.
To see even more detail, swap `-v` with `-vv`. It will print out each job
Prerequisites
-------------
* An account with an OpenStack provider that supports Nova and Cinder
-* A DNS server supporting `RFC 2136 <https://tools.ietf.org/html/rfc2136>`_. We use `bind <https://www.isc.org/downloads/bind/>`_ and `this ansible role <https://github.com/ceph/ceph-cm-ansible/blob/master/roles/nameserver/README.rst>`_ to help configure ours.
-* An `nsupdate-web <https://github.com/zmc/nsupdate-web>`_ instance configured to update DNS records. We use `an ansible role <https://github.com/ceph/ceph-cm-ansible/blob/master/roles/nsupdate_web/README.rst>`_ for this as well.
+* A DNS server supporting `RFC 2136 <https://tools.ietf.org/html/rfc2136>`_. We use `bind <https://www.isc.org/downloads/bind/>`_ and `this ansible role <https://github.com/ceph/ceph-cm-ansible/blob/main/roles/nameserver/README.rst>`_ to help configure ours.
+* An `nsupdate-web <https://github.com/zmc/nsupdate-web>`_ instance configured to update DNS records. We use `an ansible role <https://github.com/ceph/ceph-cm-ansible/blob/main/roles/nsupdate_web/README.rst>`_ for this as well.
* Configuration in `teuthology.yaml` for this backend itself (see :ref:`libcloud_config`) and `nsupdate-web`
* You will also need to choose a maximum number of nodes to be running at once, and create records in your paddles database for each one - making sure to set `is_vm` to `True` for each.
and uploads a cloud image to the OpenStack provider. ::
$ teuthology-openstack --key-filename myself.pem --key-name myself --suite dummy
- Job scheduled with name ubuntu-2015-07-24_09:03:29-dummy-master---basic-openstack and ID 1
+ Job scheduled with name ubuntu-2015-07-24_09:03:29-dummy-main---basic-openstack and ID 1
2015-07-24 09:03:30,520.520 INFO:teuthology.suite:ceph sha1: dedda6245ce8db8828fdf2d1a2bfe6163f1216a1
2015-07-24 09:03:31,620.620 INFO:teuthology.suite:ceph version: v9.0.2-829.gdedda62
- 2015-07-24 09:03:31,620.620 INFO:teuthology.suite:teuthology branch: master
- 2015-07-24 09:03:32,196.196 INFO:teuthology.suite:ceph-qa-suite branch: master
- 2015-07-24 09:03:32,197.197 INFO:teuthology.repo_utils:Fetching from upstream into /home/ubuntu/src/ceph-qa-suite_master
- 2015-07-24 09:03:33,096.096 INFO:teuthology.repo_utils:Resetting repo at /home/ubuntu/src/ceph-qa-suite_master to branch master
- 2015-07-24 09:03:33,157.157 INFO:teuthology.suite:Suite dummy in /home/ubuntu/src/ceph-qa-suite_master/suites/dummy generated 1 jobs (not yet filtered)
+ 2015-07-24 09:03:31,620.620 INFO:teuthology.suite:teuthology branch: main
+ 2015-07-24 09:03:32,196.196 INFO:teuthology.suite:ceph-qa-suite branch: main
+ 2015-07-24 09:03:32,197.197 INFO:teuthology.repo_utils:Fetching from upstream into /home/ubuntu/src/ceph-qa-suite_main
+ 2015-07-24 09:03:33,096.096 INFO:teuthology.repo_utils:Resetting repo at /home/ubuntu/src/ceph-qa-suite_main to branch main
+ 2015-07-24 09:03:33,157.157 INFO:teuthology.suite:Suite dummy in /home/ubuntu/src/ceph-qa-suite_main/suites/dummy generated 1 jobs (not yet filtered)
2015-07-24 09:03:33,158.158 INFO:teuthology.suite:Scheduling dummy/{all/nop.yaml}
- 2015-07-24 09:03:34,045.045 INFO:teuthology.suite:Suite dummy in /home/ubuntu/src/ceph-qa-suite_master/suites/dummy scheduled 1 jobs.
- 2015-07-24 09:03:34,046.046 INFO:teuthology.suite:Suite dummy in /home/ubuntu/src/ceph-qa-suite_master/suites/dummy -- 0 jobs were filtered out.
+ 2015-07-24 09:03:34,045.045 INFO:teuthology.suite:Suite dummy in /home/ubuntu/src/ceph-qa-suite_main/suites/dummy scheduled 1 jobs.
+ 2015-07-24 09:03:34,046.046 INFO:teuthology.suite:Suite dummy in /home/ubuntu/src/ceph-qa-suite_main/suites/dummy -- 0 jobs were filtered out.
2015-07-24 11:03:34,104.104 INFO:teuthology.openstack:
web interface: http://167.114.242.13:8081/
parlance) created by the OpenStack backend are exactly the same. By
default they have at least 8GB RAM, 20GB disk, 1 cpus and no disk
attached. It is equivalent to having the following in the
-`~/.teuthology.yaml <https://github.com/ceph/teuthology/blob/master/docs/siteconfig.rst>`_ file::
+`~/.teuthology.yaml <https://github.com/ceph/teuthology/blob/main/docs/siteconfig.rst>`_ file::
openstack:
...
# {uri} is ref/tag if 'tag' is set in the job yaml file
# or ref/branch if 'branch' is set in the job yaml file
# or sha1/sha1 if 'sha1' is set in the job yaml file
- # or ref/master
+ # or ref/main
# {pkg_type} is either 'deb' or 'rpm' depending on the host on which the
# packages are to be installed
# {dist} If lsb_release -si is Fedora the value is:
interactive-on-error: true
overrides:
ceph:
- branch: master
+ branch: main
fs: xfs
roles:
- - mon.a
nuke-on-error: true
kernel:
- branch: master
+ branch: main
overrides:
ceph:
branch: BRANCH_NAME
parser.add_argument(
'-c', '--ceph',
help='The ceph branch to run against',
- default=os.getenv('TEUTH_CEPH_BRANCH', 'master'),
+ default=os.getenv('TEUTH_CEPH_BRANCH', 'main'),
)
parser.add_argument(
'-k', '--kernel',
parser.add_argument(
'--suite-branch',
help='Use this suite branch instead of the ceph branch',
- default=os.getenv('TEUTH_SUITE_BRANCH', 'master'),
+ default=os.getenv('TEUTH_SUITE_BRANCH', 'main'),
)
parser.add_argument(
'-e', '--email',
)
parser.add_argument(
'--teuthology-branch',
- help="use this teuthology branch instead of master",
- default=os.getenv('TEUTH_BRANCH', 'master'),
+ help="use this teuthology branch instead of main",
+ default=os.getenv('TEUTH_BRANCH', 'main'),
)
parser.add_argument(
'--ceph-workbench-git-url',
)
parser.add_argument(
'--ceph-workbench-branch',
- help="use this ceph-workbench branch instead of master",
- default='master',
+ help="use this ceph-workbench branch instead of main",
+ default='main',
)
parser.add_argument(
'--upload',
the suite repo and contains non-empty string.
There is `teuthology_branch` present in one of
the user or system `teuthology.yaml` configuration
- files respectively, otherwise use `master`.
+ files respectively, otherwise use `main`.
-m <type>, --machine-type <type>
Machine type [default: {default_machine_type}]
-d <distro>, --distro <distro>
| | used for urgent release testing. |
+-----------------+-----------------------------------------------------------------+
| 75 <= N < 100 | Tech Leads regularly schedule integration tests with this |
-| | priority to verify pull requests against master. |
+| | priority to verify pull requests against main. |
+-----------------+-----------------------------------------------------------------+
| 100 <= N < 150 | This priority is used for QE validation of point releases. |
+-----------------+-----------------------------------------------------------------+
config.get_ceph_git_url()),
default_suite_repo=defaults('--suite-repo',
config.get_ceph_qa_suite_git_url()),
- default_ceph_branch=defaults('--ceph-branch', 'master'),
+ default_ceph_branch=defaults('--ceph-branch', 'main'),
default_job_threshold=config.job_threshold,
)
result_proc = None
if teuth_config.teuthology_path is None:
- fetch_teuthology('master')
- fetch_qa_suite('master')
+ fetch_teuthology('main')
+ fetch_qa_suite('main')
keep_running = True
job_procs = set()
assert tag is None, "cannot set both sha1 and tag"
else:
# gitbuilder uses remote-style ref names for branches, mangled to
- # have underscores instead of slashes; e.g. origin_master
+ # have underscores instead of slashes; e.g. origin_main
if tag is not None:
ref = tag
assert branch is None, "cannot set both branch and tag"
else:
if branch is None:
- branch = 'master'
+ branch = 'main'
ref = branch
sha1_url = urljoin(BASE, 'ref/{ref}/sha1'.format(ref=ref))
#!/bin/bash -ex
TEUTH_PATH=${1:-"teuthology"}
TEUTH_GIT=${2:-"https://github.com/ceph/teuthology"}
-TEUTH_BRANCH=${3:-"master"}
+TEUTH_BRANCH=${3:-"main"}
mkdir -p $TEUTH_PATH
git init $TEUTH_PATH
- ( curl --silent http://169.254.169.254/2009-04-04/meta-data/hostname | sed -e 's/[\.-].*//' ; eval printf "%03d%03d%03d%03d.{lab_domain}" $(curl --silent http://169.254.169.254/2009-04-04/meta-data/local-ipv4 | tr . ' ' ) ) | tee /etc/hostname
- hostname $(cat /etc/hostname)
- ( echo ; echo "MaxSessions 1000" ) >> /etc/ssh/sshd_config
-# See https://github.com/ceph/ceph-cm-ansible/blob/master/roles/cobbler/templates/snippets/cephlab_user
+# See https://github.com/ceph/ceph-cm-ansible/blob/main/roles/cobbler/templates/snippets/cephlab_user
- ( echo 'Defaults !requiretty' ; echo 'Defaults visiblepw' ) | tee /etc/sudoers.d/cephlab_sudo ; chmod 0440 /etc/sudoers.d/cephlab_sudo
preserve_hostname: true
system_info:
- ( curl --silent http://169.254.169.254/2009-04-04/meta-data/hostname | sed -e 's/[\.-].*//' ; eval printf "%03d%03d%03d%03d.{lab_domain}" $(curl --silent http://169.254.169.254/2009-04-04/meta-data/local-ipv4 | tr . ' ' ) ) | tee /etc/hostname
- hostname $(cat /etc/hostname)
- ( echo ; echo "MaxSessions 1000" ) >> /etc/ssh/sshd_config
-# See https://github.com/ceph/ceph-cm-ansible/blob/master/roles/cobbler/templates/snippets/cephlab_user
+# See https://github.com/ceph/ceph-cm-ansible/blob/main/roles/cobbler/templates/snippets/cephlab_user
- ( echo 'Defaults !requiretty' ; echo 'Defaults visiblepw' ) | tee /etc/sudoers.d/cephlab_sudo ; chmod 0440 /etc/sudoers.d/cephlab_sudo
preserve_hostname: true
system_info:
- ( curl --silent http://169.254.169.254/2009-04-04/meta-data/hostname | sed -e 's/[\.-].*//' ; eval printf "%03d%03d%03d%03d.{lab_domain}" $(curl --silent http://169.254.169.254/2009-04-04/meta-data/local-ipv4 | tr . ' ' ) ) | tee /etc/hostname
- hostname $(cat /etc/hostname)
- ( echo ; echo "MaxSessions 1000" ) >> /etc/ssh/sshd_config
-# See https://github.com/ceph/ceph-cm-ansible/blob/master/roles/cobbler/templates/snippets/cephlab_user
+# See https://github.com/ceph/ceph-cm-ansible/blob/main/roles/cobbler/templates/snippets/cephlab_user
- ( echo 'Defaults !requiretty' ; echo 'Defaults visiblepw' ) | tee /etc/sudoers.d/cephlab_sudo ; chmod 0440 /etc/sudoers.d/cephlab_sudo
preserve_hostname: true
system_info:
- git
- ntp
runcmd:
-# See https://github.com/ceph/ceph-cm-ansible/blob/master/roles/cobbler/templates/snippets/cephlab_user
+# See https://github.com/ceph/ceph-cm-ansible/blob/main/roles/cobbler/templates/snippets/cephlab_user
- ( echo 'Defaults !requiretty' ; echo 'Defaults visiblepw' ) | tee /etc/sudoers.d/cephlab_sudo ; chmod 0440 /etc/sudoers.d/cephlab_sudo
- echo '{username} ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
final_message: "{up}, after $UPTIME seconds"
- ( curl --silent http://169.254.169.254/2009-04-04/meta-data/hostname | sed -e 's/[\.-].*//' ; eval printf "%03d%03d%03d%03d.{lab_domain}" $(curl --silent http://169.254.169.254/2009-04-04/meta-data/local-ipv4 | tr . ' ' ) ) | tee /etc/hostname
- hostname $(cat /etc/hostname)
- ( echo ; echo "MaxSessions 1000" ) >> /etc/ssh/sshd_config
-# See https://github.com/ceph/ceph-cm-ansible/blob/master/roles/cobbler/templates/snippets/cephlab_user
+# See https://github.com/ceph/ceph-cm-ansible/blob/main/roles/cobbler/templates/snippets/cephlab_user
- ( echo 'Defaults !requiretty' ; echo 'Defaults visiblepw' ) | tee /etc/sudoers.d/cephlab_sudo ; chmod 0440 /etc/sudoers.d/cephlab_sudo
preserve_hostname: true
users:
- ( curl --silent http://169.254.169.254/2009-04-04/meta-data/hostname | sed -e 's/[\.-].*//' ; eval printf "%03d%03d%03d%03d.{lab_domain}" $(curl --silent http://169.254.169.254/2009-04-04/meta-data/local-ipv4 | tr . ' ' ) ) | tee /etc/hostname
- hostname $(cat /etc/hostname)
- ( echo ; echo "MaxSessions 1000" ) >> /etc/ssh/sshd_config
-# See https://github.com/ceph/ceph-cm-ansible/blob/master/roles/cobbler/templates/snippets/cephlab_user
+# See https://github.com/ceph/ceph-cm-ansible/blob/main/roles/cobbler/templates/snippets/cephlab_user
- ( echo 'Defaults !requiretty' ; echo 'Defaults visiblepw' ) | tee /etc/sudoers.d/cephlab_sudo ; chmod 0440 /etc/sudoers.d/cephlab_sudo
preserve_hostname: true
users:
- ( curl --silent http://169.254.169.254/2009-04-04/meta-data/hostname | sed -e 's/[\.-].*//' ; eval printf "%03d%03d%03d%03d.{lab_domain}" $(curl --silent http://169.254.169.254/2009-04-04/meta-data/local-ipv4 | tr . ' ' ) ) | tee /etc/hostname
- hostname $(cat /etc/hostname)
- ( echo ; echo "MaxSessions 1000" ) >> /etc/ssh/sshd_config
-# See https://github.com/ceph/ceph-cm-ansible/blob/master/roles/cobbler/templates/snippets/cephlab_user
+# See https://github.com/ceph/ceph-cm-ansible/blob/main/roles/cobbler/templates/snippets/cephlab_user
- ( echo 'Defaults !requiretty' ; echo 'Defaults visiblepw' ) | tee /etc/sudoers.d/cephlab_sudo ; chmod 0440 /etc/sudoers.d/cephlab_sudo
preserve_hostname: true
users:
- ( curl --silent http://169.254.169.254/2009-04-04/meta-data/hostname | sed -e 's/[\.-].*//' ; eval printf "%03d%03d%03d%03d.{lab_domain}" $(curl --silent http://169.254.169.254/2009-04-04/meta-data/local-ipv4 | tr . ' ' ) ) | tee /etc/hostname
- hostname $(cat /etc/hostname)
- ( echo ; echo "MaxSessions 1000" ) >> /etc/ssh/sshd_config
-# See https://github.com/ceph/ceph-cm-ansible/blob/master/roles/cobbler/templates/snippets/cephlab_user
+# See https://github.com/ceph/ceph-cm-ansible/blob/main/roles/cobbler/templates/snippets/cephlab_user
- ( echo 'Defaults !requiretty' ; echo 'Defaults visiblepw' ) | tee /etc/sudoers.d/cephlab_sudo ; chmod 0440 /etc/sudoers.d/cephlab_sudo
preserve_hostname: true
users:
- ( curl --silent http://169.254.169.254/2009-04-04/meta-data/hostname | sed -e 's/[\.-].*//' ; eval printf "%03d%03d%03d%03d.{lab_domain}" $(curl --silent http://169.254.169.254/2009-04-04/meta-data/local-ipv4 | tr . ' ' ) ) | tee /etc/hostname
- hostname $(cat /etc/hostname)
- ( echo ; echo "MaxSessions 1000" ) >> /etc/ssh/sshd_config
-# See https://github.com/ceph/ceph-cm-ansible/blob/master/roles/cobbler/templates/snippets/cephlab_user
+# See https://github.com/ceph/ceph-cm-ansible/blob/main/roles/cobbler/templates/snippets/cephlab_user
- ( echo 'Defaults !requiretty' ; echo 'Defaults visiblepw' ) | tee /etc/sudoers.d/cephlab_sudo ; chmod 0440 /etc/sudoers.d/cephlab_sudo
- SuSEfirewall2 stop
preserve_hostname: true
- ( curl --silent http://169.254.169.254/2009-04-04/meta-data/hostname | sed -e 's/[\.-].*//' ; eval printf "%03d%03d%03d%03d.{lab_domain}" $(curl --silent http://169.254.169.254/2009-04-04/meta-data/local-ipv4 | tr . ' ' ) ) | tee /etc/hostname
- hostname $(cat /etc/hostname)
- ( echo ; echo "MaxSessions 1000" ) >> /etc/ssh/sshd_config
-# See https://github.com/ceph/ceph-cm-ansible/blob/master/roles/cobbler/templates/snippets/cephlab_user
+# See https://github.com/ceph/ceph-cm-ansible/blob/main/roles/cobbler/templates/snippets/cephlab_user
- ( echo 'Defaults !requiretty' ; echo 'Defaults visiblepw' ) | tee /etc/sudoers.d/cephlab_sudo ; chmod 0440 /etc/sudoers.d/cephlab_sudo
- SuSEfirewall2 stop
preserve_hostname: true
- ( curl --silent http://169.254.169.254/2009-04-04/meta-data/hostname | sed -e 's/[\.-].*//' ; eval printf "%03d%03d%03d%03d.{lab_domain}" $(curl --silent http://169.254.169.254/2009-04-04/meta-data/local-ipv4 | tr . ' ' ) ) | tee /etc/hostname
- hostname $(cat /etc/hostname)
- ( echo ; echo "MaxSessions 1000" ) >> /etc/ssh/sshd_config
-# See https://github.com/ceph/ceph-cm-ansible/blob/master/roles/cobbler/templates/snippets/cephlab_user
+# See https://github.com/ceph/ceph-cm-ansible/blob/main/roles/cobbler/templates/snippets/cephlab_user
- ( echo 'Defaults !requiretty' ; echo 'Defaults visiblepw' ) | tee /etc/sudoers.d/cephlab_sudo ; chmod 0440 /etc/sudoers.d/cephlab_sudo
- SuSEfirewall2 stop
preserve_hostname: true
- ( curl --silent http://169.254.169.254/2009-04-04/meta-data/hostname | sed -e 's/[\.-].*//' ; eval printf "%03d%03d%03d%03d.{lab_domain}" $(curl --silent http://169.254.169.254/2009-04-04/meta-data/local-ipv4 | tr . ' ' ) ) | tee /etc/hostname
- hostname $(cat /etc/hostname)
- ( echo ; echo "MaxSessions 1000" ) >> /etc/ssh/sshd_config
-# See https://github.com/ceph/ceph-cm-ansible/blob/master/roles/cobbler/templates/snippets/cephlab_user
+# See https://github.com/ceph/ceph-cm-ansible/blob/main/roles/cobbler/templates/snippets/cephlab_user
- ( echo 'Defaults !requiretty' ; echo 'Defaults visiblepw' ) | tee /etc/sudoers.d/cephlab_sudo ; chmod 0440 /etc/sudoers.d/cephlab_sudo
preserve_hostname: true
users:
- echo nameserver {nameserver} | tee /etc/resolv.conf
- echo search {lab_domain} | tee -a /etc/resolv.conf
- ( echo ; echo "MaxSessions 1000" ) >> /etc/ssh/sshd_config
-# See https://github.com/ceph/ceph-cm-ansible/blob/master/roles/cobbler/templates/snippets/cephlab_user
+# See https://github.com/ceph/ceph-cm-ansible/blob/main/roles/cobbler/templates/snippets/cephlab_user
- ( echo 'Defaults !requiretty' ; echo 'Defaults visiblepw' ) | tee /etc/sudoers.d/cephlab_sudo ; chmod 0440 /etc/sudoers.d/cephlab_sudo
preserve_hostname: true
users:
teuthology_argv = [
'--suite', 'upgrade/hammer',
'--dry-run',
- '--ceph', 'master',
+ '--ceph', 'main',
'--kernel', 'distro',
'--flavor', 'gcov',
'--distro', 'ubuntu',
config = {
'all':
- {'branch': 'master'},
+ {'branch': 'main'},
'branch': 'next'
}
_get_config_value_for_remote(ctx, remote, config, 'branch')
- would return 'master'.
+ would return 'main'.
:param ctx: the argparse.Namespace object
:param remote: the teuthology.orchestra.remote.Remote object
remote, the sha1 from the config will be used.
If a tag, branch or sha1 can't be found it will default to use the
- build from the master branch.
+ build from the main branch.
- :returns: A string URI. Ex: ref/master
+ :returns: A string URI. Ex: ref/main
"""
ref_name, ref_val = next(iter(self._choose_reference().items()))
if ref_name == 'sha1':
Decide which to use.
:returns: a single-key dict containing the name and value of the
- reference to use, e.g. {'branch': 'master'}
+ reference to use, e.g. {'branch': 'main'}
"""
tag = branch = sha1 = None
if self.remote:
warn('sha1')
return dict(sha1=sha1)
else:
- log.warning("defaulting to master branch")
- return dict(branch='master')
+ log.warning("defaulting to main branch")
+ return dict(branch='main')
def _get_base_url(self):
"""
except ImportError:
log.info("Tasks not found; will attempt to fetch")
- ceph_branch = job_config.get('branch', 'master')
+ ceph_branch = job_config.get('branch', 'main')
suite_repo = job_config.get('suite_repo')
if suite_repo:
teuth_config.ceph_qa_suite_git_url = suite_repo
of the teuthology config files ``$HOME/teuthology.yaml``
or ``/etc/teuthology.yaml`` correspondingly.
- Use ``master``.
+ Use ``main``.
Generate exception if the branch is not present in the repo.
log.warning(
'The teuthology branch config is empty, skipping')
if not teuthology_branch:
- teuthology_branch = config.get('teuthology_branch', 'master')
+ teuthology_branch = config.get('teuthology_branch', 'main')
teuthology_sha1 = util.git_ls_remote(
'teuthology',
suite_repo_project_or_url = self.args.suite_repo or 'ceph-qa-suite'
suite_branch = self.args.suite_branch
ceph_branch = self.args.ceph_branch
- if suite_branch and suite_branch != 'master':
+ if suite_branch and suite_branch != 'main':
if not util.git_branch_exists(
suite_repo_project_or_url,
suite_branch
suite_branch = ceph_branch
else:
log.info(
- "branch {0} not in {1}; will use master for"
+ "branch {0} not in {1}; will use main for"
" ceph-qa-suite".format(
ceph_branch,
suite_repo_name
))
- suite_branch = 'master'
+ suite_branch = 'main'
return suite_branch
def choose_suite_hash(self, suite_branch):
Use the following testing priority
10 to 49: Tests which are urgent and blocking other important development.
50 to 74: Testing a particular feature/fix with less than 25 jobs and can also be used for urgent release testing.
-75 to 99: Tech Leads usually schedule integration tests with this priority to verify pull requests against master.
+75 to 99: Tech Leads usually schedule integration tests with this priority to verify pull requests against main.
100 to 149: QE validation of point releases.
150 to 199: Testing a particular feature/fix with less than 100 jobs and results will be available in a day or so.
200 to 1000: Large test runs that can be done over the course of a week.
exists=fake_false,
):
main([
- '--ceph', 'master',
+ '--ceph', 'main',
'--suite', suite_name,
'--throttle', throttle,
'--machine-type', machine_type,
m['package_version_for_hash'].return_value = 'fake-9.5'
config.suite_verify_ceph_hash = False
main([
- '--ceph', 'master',
+ '--ceph', 'main',
'--suite', suite_name,
'--suite-dir', suite_dir,
'--suite-relpath', '',
m['package_version_for_hash'].return_value = 'fake-9.5'
config.suite_verify_ceph_hash = True
main([
- '--ceph', 'master',
+ '--ceph', 'main',
'--suite', suite_name,
'--suite-dir', suite_dir,
'--suite-relpath', '',
# neuter choose_X_branch
m_git_validate_sha1.return_value = self.args_dict['ceph_sha1']
m_choose_ceph_version.return_value = self.args_dict['ceph_sha1']
- self.args_dict['teuthology_branch'] = 'master'
- self.args_dict['suite_branch'] = 'master'
+ self.args_dict['teuthology_branch'] = 'main'
+ self.args_dict['suite_branch'] = 'main'
m_git_ls_remote.return_value = 'suite_sha1'
runobj = self.klass(self.args)
m_qa_teuthology_branch_exists.return_value = False
self.args_dict = {
'base_yaml_paths': [],
- 'ceph_branch': 'master',
+ 'ceph_branch': 'main',
'machine_type': 'smithi',
'flavor': 'default',
'kernel_branch': 'testing',
suite='suite',
suite_relpath='',
suite_dir='suite_dir',
- suite_branch='master',
+ suite_branch='main',
ceph_branch='ceph_branch',
ceph_sha1='ceph_sha1',
- teuthology_branch='master',
+ teuthology_branch='main',
kernel_branch=None,
flavor='flavor',
distro='ubuntu',
assert False == util.git_branch_exists(
project_or_url, 'nobranchnowaycanthappen')
m_check_output.return_value = b'HHH branch'
- assert True == util.git_branch_exists(project_or_url, 'master')
+ assert True == util.git_branch_exists(project_or_url, 'main')
@pytest.fixture
mock_resp.ok = True
mock_resp.json.return_value = "some json"
m_get.return_value = mock_resp
- result = util.get_branch_info("teuthology", "master")
+ result = util.get_branch_info("teuthology", "main")
m_get.assert_called_with(
- "https://api.github.com/repos/ceph/teuthology/git/refs/heads/master"
+ "https://api.github.com/repos/ceph/teuthology/git/refs/heads/main"
)
assert result == "some json"
def test_git_ls_remote(self, m_get_ceph_git_url, git_repository):
m_get_ceph_git_url.return_value = git_repository
assert util.git_ls_remote('ceph', 'nobranch') is None
- assert util.git_ls_remote('ceph', 'master') is not None
+ assert util.git_ls_remote('ceph', 'main') is not None
@patch('teuthology.suite.util.requests.get')
def test_find_git_parent(self, m_requests_get):
The reason the teuthology repo is also fetched is that currently we use
subprocess to call teuthology-schedule to schedule jobs so we need to make
- sure it is up-to-date. For that reason we always fetch the master branch
+ sure it is up-to-date. For that reason we always fetch the main branch
for test scheduling, regardless of what teuthology branch is requested for
testing.
# When a user is scheduling a test run from their own copy of
# teuthology, let's not wreak havoc on it.
if config.automated_scheduling:
- # We use teuthology's master branch in all cases right now
+ # We use teuthology's main branch in all cases right now
if config.teuthology_path is None:
- fetch_teuthology('master')
+ fetch_teuthology('main')
suite_repo_path = fetch_qa_suite(branch)
except BranchNotFoundError as exc:
schedule_fail(message=str(exc), name=test_name)
# Alternate method for github-hosted projects - left here for informational
# purposes
# resp = requests.get(
- # 'https://api.github.com/repos/ceph/ceph/git/refs/heads/master')
+ # 'https://api.github.com/repos/ceph/ceph/git/refs/heads/main')
# hash = .json()['object']['sha']
(arch, release, _os) = get_distro_defaults(distro, machine_type)
if distro is None:
repo: A path or URL to a repo (defaults to '.'). Given a repo
value of 'foo', ANSIBLE_ROLES_PATH is set to 'foo/roles'
branch: If pointing to a remote git repo, use this branch. Defaults
- to 'master'.
+ to 'main'.
hosts: A list of teuthology roles or partial hostnames (or a
combination of the two). ansible-playbook will only be run
against hosts that match.
if repo.startswith(('http://', 'https://', 'git@', 'git://')):
repo_path = fetch_repo(
repo,
- self.config.get('branch', 'master'),
+ self.config.get('branch', 'main'),
)
else:
repo_path = os.path.abspath(os.path.expanduser(repo))
- ansible.cephlab:
repo: {git_base}ceph-cm-ansible.git
- branch: master
+ branch: main
playbook: cephlab.yml
If a dynamic inventory is used, all hosts will be assigned to the
#
function install_deps() {
if [ ! -f install-deps.sh ]; then
- git archive --remote=git://git.ceph.com/ceph.git master install-deps.sh | tar -xvf -
+ git archive --remote=git://git.ceph.com/ceph.git main install-deps.sh | tar -xvf -
fi
#
# drop the following hack when trusty is not supported anymore
touch $d/sha1/$sha1_branch3
link_same $d/ref $d/secondary $sha1_branch3
test $(readlink --canonicalize $d/ref/branch3) = $d/sha1/$sha1_branch3 || return 1
- test $(readlink --canonicalize $d/ref/master) = $d/sha1/$sha1_branch3 || return 1
+ test $(readlink --canonicalize $d/ref/main) = $d/sha1/$sha1_branch3 || return 1
touch $d/sha1/$tag2
link_same $d/ref $d/secondary $tag2
#
# Create and upload a deb repository with the same naming conventions
-# as https://github.com/ceph/autobuild-ceph/blob/master/build-ceph-deb.sh
+# as https://github.com/ceph/autobuild-ceph/blob/main/build-ceph-deb.sh
#
set -xe
#
# Create and upload a RPM repository with the same naming conventions
-# as https://github.com/ceph/autobuild-ceph/blob/master/build-ceph-rpm.sh
+# as https://github.com/ceph/autobuild-ceph/blob/main/build-ceph-rpm.sh
#
set -xe
- ceph-ansible:
repo: {git_base}ceph-ansible.git
- branch: mybranch # defaults to master
+ branch: mybranch # defaults to main
ansible-version: 2.4 # defaults to 2.5
vars:
ceph_dev: True ( default)
if 'ceph_dev_key' not in vars:
vars['ceph_dev_key'] = 'https://download.ceph.com/keys/autobuild.asc'
if 'ceph_dev_branch' not in vars:
- vars['ceph_dev_branch'] = ctx.config.get('branch', 'master')
+ vars['ceph_dev_branch'] = ctx.config.get('branch', 'main')
self.cluster_name = vars.get('cluster', 'ceph')
def setup(self):
'python-dev'
])
ansible_repo = self.config['repo']
- branch = 'master'
+ branch = 'main'
if self.config.get('branch'):
branch = self.config.get('branch')
ansible_ver = 'ansible==2.5'
dist = "precise",
arch = "x86_64",
flavor = "default",
- branch = "master")
+ branch = "main")
run.wait(
hadoops.run(
sha1: 1234
where sha1 matches the --ceph argument. For instance if
- teuthology-suite is called with --ceph master, the sha1 will be
- the tip of master. If called with --ceph v0.94.1, the sha1 will be
+ teuthology-suite is called with --ceph main, the sha1 will be
+ the tip of main. If called with --ceph v0.94.1, the sha1 will be
the v0.94.1 (as returned by git rev-parse v0.94.1 which is not to
be confused with git rev-parse v0.94.1^{commit})
log = logging.getLogger(__name__)
-CONFIG_DEFAULT = {'branch': 'master'}
+CONFIG_DEFAULT = {'branch': 'main'}
TIMEOUT_DEFAULT = 300
VERSION_KEYS = ['branch', 'tag', 'sha1', 'deb', 'rpm', 'koji', 'koji_task']
This can be a branch, tag, or sha1 of ceph-client.git or a local
kernel package.
- To install ceph-client.git branch (default: master)::
+ To install ceph-client.git branch (default: main)::
kernel:
branch: testing
client.1:
branch: more_specific
osd.3:
- branch: master
+ branch: main
To wait 3 minutes for hosts to reboot (default: 300)::
'wget',
'-nv',
'--no-check-certificate',
- 'https://raw.github.com/gregsfortytwo/FileLocker/master/sclockandhold.cpp',
+ 'https://raw.github.com/gregsfortytwo/FileLocker/main/sclockandhold.cpp',
'-O', '{tdir}/lockfile/sclockandhold.cpp'.format(tdir=testdir),
run.Raw('&&'),
'g++', '{tdir}/lockfile/sclockandhold.cpp'.format(tdir=testdir),
mpiexec = config['exec'].replace('$TESTDIR', testdir)
hosts = []
remotes = []
- master_remote = None
+ main_remote = None
if 'nodes' in config:
if isinstance(config['nodes'], str) and config['nodes'] == 'all':
for role in teuthology.all_roles(ctx.cluster):
ip,port = remote.ssh.get_transport().getpeername()
hosts.append(ip)
remotes.append(remote)
- (master_remote,) = ctx.cluster.only(config['nodes'][0]).remotes.keys()
+ (main_remote,) = ctx.cluster.only(config['nodes'][0]).remotes.keys()
elif isinstance(config['nodes'], list):
for role in config['nodes']:
(remote,) = ctx.cluster.only(role).remotes.keys()
ip,port = remote.ssh.get_transport().getpeername()
hosts.append(ip)
remotes.append(remote)
- (master_remote,) = ctx.cluster.only(config['nodes'][0]).remotes.keys()
+ (main_remote,) = ctx.cluster.only(config['nodes'][0]).remotes.keys()
else:
roles = ['client.{id}'.format(id=id_) for id_ in teuthology.all_roles_of_type(ctx.cluster, 'client')]
- (master_remote,) = ctx.cluster.only(roles[0]).remotes.keys()
+ (main_remote,) = ctx.cluster.only(roles[0]).remotes.keys()
for role in roles:
(remote,) = ctx.cluster.only(role).remotes.keys()
ip,port = remote.ssh.get_transport().getpeername()
if 'workdir' in config:
workdir = ['-wdir', config['workdir'].replace('$TESTDIR', testdir) ]
- log.info('mpi rank 0 is: {name}'.format(name=master_remote.name))
+ log.info('mpi rank 0 is: {name}'.format(name=main_remote.name))
# write out the mpi hosts file
log.info('mpi nodes: [%s]' % (', '.join(hosts)))
- teuthology.write_file(remote=master_remote,
+ teuthology.write_file(remote=main_remote,
path='{tdir}/mpi-hosts'.format(tdir=testdir),
data='\n'.join(hosts))
- log.info('mpiexec on {name}: {cmd}'.format(name=master_remote.name, cmd=mpiexec))
+ log.info('mpiexec on {name}: {cmd}'.format(name=main_remote.name, cmd=mpiexec))
args=['mpiexec', '-f', '{tdir}/mpi-hosts'.format(tdir=testdir)]
args.extend(workdir)
args.extend(mpiexec.split(' '))
- master_remote.run(args=args, )
+ main_remote.run(args=args, )
log.info('mpi task completed')
- master_remote.run(args=['rm', '{tdir}/mpi-hosts'.format(tdir=testdir)])
+ main_remote.run(args=['rm', '{tdir}/mpi-hosts'.format(tdir=testdir)])
def test_ceph_hash_simple(self):
resp = requests.get(
- 'https://api.github.com/repos/ceph/ceph/git/refs/heads/master')
+ 'https://api.github.com/repos/ceph/ceph/git/refs/heads/main')
ref_hash = resp.json()['object']['sha']
assert suite.get_hash('ceph') == ref_hash
def test_kernel_hash_saya(self):
# We don't currently have these packages.
- assert suite.get_hash('kernel', 'master', 'default', 'saya') is None
+ assert suite.get_hash('kernel', 'main', 'default', 'saya') is None
- def test_all_master_branches(self):
+ def test_all_main_branches(self):
# Don't attempt to send email
config.results_email = None
- job_config = suite.create_initial_config('suite', 'master',
- 'master', 'master', 'testing',
+ job_config = suite.create_initial_config('suite', 'main',
+ 'main', 'main', 'testing',
'default', 'centos', 'plana')
assert ((job_config.branch, job_config.teuthology_branch,
- job_config.suite_branch) == ('master', 'master', 'master'))
+ job_config.suite_branch) == ('main', 'main', 'main'))
def test_config_bogus_kernel_branch(self):
# Don't attempt to send email
config.results_email = None
with raises(suite.ScheduleFailError):
- suite.create_initial_config('s', None, 'master', 't',
+ suite.create_initial_config('s', None, 'main', 't',
'bogus_kernel_branch', 'f', 'd', 'm')
def test_config_bogus_flavor(self):
# Don't attempt to send email
config.results_email = None
with raises(suite.ScheduleFailError):
- suite.create_initial_config('s', None, 'master', 't', 'k',
+ suite.create_initial_config('s', None, 'main', 't', 'k',
'bogus_flavor', 'd', 'm')
def test_config_bogus_ceph_branch(self):
# Don't attempt to send email
config.results_email = None
with raises(suite.ScheduleFailError):
- suite.create_initial_config('s', 'bogus_suite_branch', 'master',
+ suite.create_initial_config('s', 'bogus_suite_branch', 'main',
't', 'k', 'f', 'd', 'm')
def test_config_bogus_teuthology_branch(self):
# Don't attempt to send email
config.results_email = None
with raises(suite.ScheduleFailError):
- suite.create_initial_config('s', None, 'master',
+ suite.create_initial_config('s', None, 'main',
'bogus_teuth_branch', 'k', 'f', 'd',
'm')
def test_config_substitution(self):
# Don't attempt to send email
config.results_email = None
- job_config = suite.create_initial_config('MY_SUITE', 'master',
- 'master', 'master', 'testing',
+ job_config = suite.create_initial_config('MY_SUITE', 'main',
+ 'main', 'main', 'testing',
'default', 'centos', 'plana')
assert job_config['suite'] == 'MY_SUITE'
def test_config_kernel_section(self):
# Don't attempt to send email
config.results_email = None
- job_config = suite.create_initial_config('MY_SUITE', 'master',
- 'master', 'master', 'testing',
+ job_config = suite.create_initial_config('MY_SUITE', 'main',
+ 'main', 'main', 'testing',
'default', 'centos', 'plana')
assert job_config['kernel']['kdb'] is True
task = self.klass(self.ctx, self.task_config)
task.find_repo()
m_fetch_repo.assert_called_once_with(self.task_config['repo'],
- 'master')
+ 'main')
@patch('teuthology.task.ansible.fetch_repo')
def test_find_repo_git(self, m_fetch_repo):
task = self.klass(self.ctx, self.task_config)
task.find_repo()
m_fetch_repo.assert_called_once_with(self.task_config['repo'],
- 'master')
+ 'main')
def test_playbook_none(self):
del self.task_config['playbook']
'ceph-cm-ansible.git')
task = self.klass(self.ctx, dict())
task.find_repo()
- m_fetch_repo.assert_called_once_with(repo, 'master')
+ m_fetch_repo.assert_called_once_with(repo, 'main')
def test_playbook_file(self):
fake_playbook = [dict(fake_playbook=True)]
# Inktank configuration
archive_server = "http://qa-proxy.ceph.com/teuthology/"
config.archive_server = archive_server
- archive_dir = "/var/lib/teuthworker/archive/teuthology-2013-09-12_11:49:50-ceph-deploy-master-testing-basic-vps"
+ archive_dir = "/var/lib/teuthworker/archive/teuthology-2013-09-12_11:49:50-ceph-deploy-main-testing-basic-vps"
job_id = 31087
path = misc.get_http_log_path(archive_dir, job_id)
- assert path == "http://qa-proxy.ceph.com/teuthology/teuthology-2013-09-12_11:49:50-ceph-deploy-master-testing-basic-vps/31087/"
+ assert path == "http://qa-proxy.ceph.com/teuthology/teuthology-2013-09-12_11:49:50-ceph-deploy-main-testing-basic-vps/31087/"
path = misc.get_http_log_path(archive_dir)
- assert path == "http://qa-proxy.ceph.com/teuthology/teuthology-2013-09-12_11:49:50-ceph-deploy-master-testing-basic-vps/"
+ assert path == "http://qa-proxy.ceph.com/teuthology/teuthology-2013-09-12_11:49:50-ceph-deploy-main-testing-basic-vps/"
def test_is_type():
is_client('client')
assert not is_client('foo.bar.baz')
assert not is_client('ceph.client')
- assert not is_client('hadoop.master.0')
+ assert not is_client('hadoop.main.0')
def test_is_type_in_cluster():
.test_init_from_remote_base_url(
"https://shaman.ceph.com/api/search?status=ready"
"&project=ceph&flavor=default"
- "&distros=ubuntu%2F20.04%2Fx86_64&ref=master"
+ "&distros=ubuntu%2F20.04%2Fx86_64&ref=main"
)
def test_init_from_remote_base_url_debian(self):
.test_init_from_remote_base_url_debian(
"https://shaman.ceph.com/api/search?status=ready"
"&project=ceph&flavor=default"
- "&distros=debian%2F7.1%2Fx86_64&ref=master"
+ "&distros=debian%2F7.1%2Fx86_64&ref=main"
)
def test_init_from_config_base_url(self):
"job_name": "ceph-dev-build/ARCH=x86_64,AVAILABLE_ARCH=x86_64,AVAILABLE_DIST=centos8,DIST=centos8,MACHINE_SIZE=gigantic",
"package_manager_version": "17.0.0-8856.g534fc6d9"
},
- "url": "https://3.chacra.ceph.com/r/ceph/master/534fc6d936bd506119f9e0921ff8cf8d47caa323/centos/8/flavors/default/",
+ "url": "https://3.chacra.ceph.com/r/ceph/main/534fc6d936bd506119f9e0921ff8cf8d47caa323/centos/8/flavors/default/",
"modified": "2021-11-06 21:40:40.669823",
"distro_version": "8",
"project": "ceph",
"flavor": "default",
- "ref": "master",
- "chacra_url": "https://3.chacra.ceph.com/repos/ceph/master/534fc6d936bd506119f9e0921ff8cf8d47caa323/centos/8/flavors/default/",
+ "ref": "main",
+ "chacra_url": "https://3.chacra.ceph.com/repos/ceph/main/534fc6d936bd506119f9e0921ff8cf8d47caa323/centos/8/flavors/default/",
"archs": [
"x86_64",
"arm64",
"url": "https://jenkins.ceph.com/job/ceph-dev-build/ARCH=arm64,AVAILABLE_ARCH=arm64,AVAILABLE_DIST=centos8,DIST=centos8,MACHINE_SIZE=gigantic/48556/",
"log_url": "https://jenkins.ceph.com/job/ceph-dev-build/ARCH=arm64,AVAILABLE_ARCH=arm64,AVAILABLE_DIST=centos8,DIST=centos8,MACHINE_SIZE=gigantic/48556//consoleFull",
"flavor": "default",
- "ref": "master",
+ "ref": "main",
"distro": "centos"
},
{
"url": "https://jenkins.ceph.com/job/ceph-dev-build/ARCH=x86_64,AVAILABLE_ARCH=x86_64,AVAILABLE_DIST=centos8,DIST=centos8,MACHINE_SIZE=gigantic/48556/",
"log_url": "https://jenkins.ceph.com/job/ceph-dev-build/ARCH=x86_64,AVAILABLE_ARCH=x86_64,AVAILABLE_DIST=centos8,DIST=centos8,MACHINE_SIZE=gigantic/48556//consoleFull",
"flavor": "default",
- "ref": "master",
+ "ref": "main",
"distro": "centos"
}
]
config = dict(
os_type="centos",
os_version="8",
- branch='master',
+ branch='main',
arch='x86_64',
flavor='default',
)
"job_id": "1",
"worker_log": "worker_log",
"archive_path": "archive/path",
- "teuthology_branch": "master"
+ "teuthology_branch": "main"
}
process = Mock()
process.poll.return_value = "not None"
config['name'],
config['job_id'],
)
- assert got_config['teuthology_branch'] == 'master'
- assert m_fetch_teuthology.called_once_with_args(branch='master')
+ assert got_config['teuthology_branch'] == 'main'
+ assert m_fetch_teuthology.called_once_with_args(branch='main')
assert teuth_bin_path == '/teuth/path/virtualenv/bin'
- assert m_fetch_qa_suite.called_once_with_args(branch='master')
+ assert m_fetch_qa_suite.called_once_with_args(branch='main')
assert got_config['suite_path'] == '/suite/path'
def build_fake_jobs(self, m_connection, m_job, job_bodies):
result_proc = None
if teuth_config.teuthology_path is None:
- fetch_teuthology('master')
- fetch_qa_suite('master')
+ fetch_teuthology('main')
+ fetch_qa_suite('main')
keep_running = True
while keep_running:
archive_dir, safe_archive, str(job_id))
job_config['archive_path'] = archive_path_full
- # If the teuthology branch was not specified, default to master and
+ # If the teuthology branch was not specified, default to main and
# store that value.
- teuthology_branch = job_config.get('teuthology_branch', 'master')
+ teuthology_branch = job_config.get('teuthology_branch', 'main')
job_config['teuthology_branch'] = teuthology_branch
teuthology_sha1 = job_config.get('teuthology_sha1')
if not teuthology_sha1:
teuth_path = fetch_teuthology(branch=teuthology_branch,
commit=teuthology_sha1)
# For the teuthology tasks, we look for suite_branch, and if we
- # don't get that, we look for branch, and fall back to 'master'.
+ # don't get that, we look for branch, and fall back to 'main'.
# last-in-suite jobs don't have suite_branch or branch set.
- ceph_branch = job_config.get('branch', 'master')
+ ceph_branch = job_config.get('branch', 'main')
suite_branch = job_config.get('suite_branch', ceph_branch)
suite_sha1 = job_config.get('suite_sha1')
suite_repo = job_config.get('suite_repo')
projects / teuthology.git / commitdiff