| lbrabec | |
| kparal | |
| tflink | |
| jskladan |
We need this in order not to use copr repos on dev/stg/prod but rather use infra repos instead.
Tested locally, works for me.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | conf/taskotron.yaml.example (4 lines) | |||
| M | libtaskotron/config_defaults.py (4 lines) | |||
| M | libtaskotron/minion.py (9 lines) |
| Commit | Tree | Parents | Author | Summary | Date |
|---|---|---|---|---|---|
| c70300141cf6 | bcd18301b56b | 63630372656d | Martin Krizek | Make minion repos configurable (Show More…) | Dec 7 2015, 10:51 AM |
| Show First 20 Lines • Show All 136 Lines • ▼ Show 20 Line(s) | |||||
| 137 | #cachedir: /var/cache/taskotron | 137 | #cachedir: /var/cache/taskotron | ||
| 138 | 138 | | |||
| 139 | ## The location of images for disposable clients | 139 | ## The location of images for disposable clients | ||
| 140 | #imagesdir: /var/lib/taskotron/images | 140 | #imagesdir: /var/lib/taskotron/images | ||
| 141 | 141 | | |||
| 142 | ## Temporary option to specify url of an image to download and use for disposable client | 142 | ## Temporary option to specify url of an image to download and use for disposable client | ||
| 143 | #imageurl: | 143 | #imageurl: | ||
| 144 | 144 | | |||
| 145 | ## Additional repos for minion to install packages from | ||||
| 146 | #minion_repos: | ||||
| 147 | # - https://copr-fe.cloud.fedoraproject.org/coprs/tflink/taskotron/repo/fedora-23/tflink-taskotron-fedora-23.repo | ||||
| 148 | | ||||
| 145 | 149 | | |||
| 146 | ## ==== LOGGING section ==== | 150 | ## ==== LOGGING section ==== | ||
| 147 | ## This section contains configuration of logging. | 151 | ## This section contains configuration of logging. | ||
| 148 | 152 | | |||
| 149 | ## Configuration of logging level. Here can be configured which messages | 153 | ## Configuration of logging level. Here can be configured which messages | ||
| 150 | ## will be logged. You can specify different level for logging to standard | 154 | ## will be logged. You can specify different level for logging to standard | ||
| 151 | ## output (option log_level_stream) and logging to file (log_level_file). | 155 | ## output (option log_level_stream) and logging to file (log_level_file). | ||
| 152 | ## Possible values can be found here: | 156 | ## Possible values can be found here: | ||
| Show All 24 Lines | |||||
| Show First 20 Lines • Show All 79 Lines • ▼ Show 20 Line(s) | 31 | class Config(object): | |||
|---|---|---|---|---|---|
| 80 | client_taskdir = '/var/tmp/taskotron/taskdir' #: | 80 | client_taskdir = '/var/tmp/taskotron/taskdir' #: | ||
| 81 | artifactsdir = '/var/lib/taskotron/artifacts' #: | 81 | artifactsdir = '/var/lib/taskotron/artifacts' #: | ||
| 82 | cachedir = '/var/cache/taskotron' #: | 82 | cachedir = '/var/cache/taskotron' #: | ||
| 83 | imagesdir = '/var/lib/taskotron/images' #: | 83 | imagesdir = '/var/lib/taskotron/images' #: | ||
| 84 | imageurl = 'http://download.fedoraproject.org/pub/fedora/linux/'\ | 84 | imageurl = 'http://download.fedoraproject.org/pub/fedora/linux/'\ | ||
| 85 | 'releases/23/Cloud/x86_64/Images/Fedora-Cloud-'\ | 85 | 'releases/23/Cloud/x86_64/Images/Fedora-Cloud-'\ | ||
| 86 | 'Base-23-20151030.x86_64.qcow2' #: | 86 | 'Base-23-20151030.x86_64.qcow2' #: | ||
| 87 | 87 | | |||
| 88 | minion_repos = ['https://copr-fe.cloud.fedoraproject.org/coprs/tflink/' | ||||
| 89 | 'taskotron/repo/fedora-23/' | ||||
| 90 | 'tflink-taskotron-fedora-23.repo'] #: | ||||
| 91 | | ||||
| 88 | log_level_stream = 'INFO' #: | 92 | log_level_stream = 'INFO' #: | ||
| 89 | log_level_file = 'DEBUG' #: | 93 | log_level_file = 'DEBUG' #: | ||
| 90 | 94 | | |||
| 91 | log_file_enabled = False #: | 95 | log_file_enabled = False #: | ||
| 92 | 96 | | |||
| 93 | fas_username = 'taskotron' #: | 97 | fas_username = 'taskotron' #: | ||
| 94 | fas_password = '' #: | 98 | fas_password = '' #: | ||
| 95 | ssh_privkey = '' #: | 99 | ssh_privkey = '' #: | ||
| Show All 38 Lines | |||||
| Show First 20 Lines • Show All 45 Lines • ▼ Show 20 Line(s) | 29 | def __init__(self, task_data, arg_data): | |||
|---|---|---|---|---|---|
| 46 | self.exitcode = None | 46 | self.exitcode = None | ||
| 47 | self.ssh = None | 47 | self.ssh = None | ||
| 48 | 48 | | |||
| 49 | def _prepare_task(self): | 49 | def _prepare_task(self): | ||
| 50 | '''Prepare the environment to run the task.''' | 50 | '''Prepare the environment to run the task.''' | ||
| 51 | 51 | | |||
| 52 | self.taskdir = config.get_config().client_taskdir | 52 | self.taskdir = config.get_config().client_taskdir | ||
| 53 | 53 | | |||
| 54 | # FIXME remove this once the vm code is done | 54 | # add additional repos to minion | ||
| 55 | self.ssh.cmd('curl -o /etc/yum.repos.d/tflink-taskotron-fedora-f23.repo ' | 55 | repos = [' --add-repo %s' % repo for repo in config.get_config().minion_repos] | ||
| 56 | 'http://copr-fe.cloud.fedoraproject.org/coprs/tflink/taskotron/' | 56 | if repos: | ||
| 57 | 'repo/fedora-23/tflink-taskotron-fedora-23.repo') | 57 | self.ssh.cmd('dnf config-manager%s' % ''.join(repos)) | ||
| 58 | | ||||
| 58 | # FIXME this should only need libtaskotron-core T651 | 59 | # FIXME this should only need libtaskotron-core T651 | ||
| 59 | # libtaskotron-fedora should be installed as a check dep | 60 | # libtaskotron-fedora should be installed as a check dep | ||
| 60 | self.ssh.install_pkgs('libtaskotron-core, libtaskotron-fedora') | 61 | self.ssh.install_pkgs('libtaskotron-core, libtaskotron-fedora') | ||
| 61 | 62 | | |||
| 62 | # Copy config files. Go through CONF_DIRS in reversed order to preserve priority. | 63 | # Copy config files. Go through CONF_DIRS in reversed order to preserve priority. | ||
| 63 | for config_dir in reversed(config.CONF_DIRS): | 64 | for config_dir in reversed(config.CONF_DIRS): | ||
| 64 | if os.path.exists(config_dir): | 65 | if os.path.exists(config_dir): | ||
| 65 | self.ssh.put_dir(config_dir, '/etc/taskotron/') | 66 | self.ssh.put_dir(config_dir, '/etc/taskotron/') | ||
| ▲ Show 20 Lines • Show All 121 Lines • Show Last 20 Lines | |||||