Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

openQA: update some branch names to 'main' not 'master'

Browse source 
Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2021-06-01 13:38:42 -07:00
parent 0029b86d94
commit ca112a1922
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
roles/openqa/dispatcher/tasks/main.yml
View file

@ -201,7 +201,7 @@
dest: /root/fedora_openqa dest: /root/fedora_openqa
register: gittools register: gittools
# case of the 'n' seems inconstant, so intentionally omitted # case of the 'n' seems inconstant, so intentionally omitted
when: "(toolsbranch.stderr.find('ot a git repository') != -1) or (toolsbranch.stdout.find('On branch master') != -1)" when: "(toolsbranch.stderr.find('ot a git repository') != -1) or (toolsbranch.stdout.find('On branch main') != -1)"
- name: Check if fedora_openqa is installed for current Python - name: Check if fedora_openqa is installed for current Python
command: "pip show fedora_openqa" command: "pip show fedora_openqa"

2
roles/openqa/worker/defaults/main.yml
View file

@ -1,6 +1,6 @@
openqa_hostname: localhost openqa_hostname: localhost
openqa_repo: updates openqa_repo: updates
openqa_createhdds_branch: master openqa_createhdds_branch: main
openqa_nfs_worker: false openqa_nfs_worker: false
openqa_tap: false openqa_tap: false
openqa_hdds_worker: false openqa_hdds_worker: false

2
roles/openqa/worker/tasks/createhdds.yml
View file

@ -1,7 +1,7 @@
# Required vars with defaults # Required vars with defaults
# - openqa_createhdds_branch # - openqa_createhdds_branch
## string - The git branch of createhdds to check out ## string - The git branch of createhdds to check out
## default - master ## default - main
- name: Install required packages - name: Install required packages
package: package: