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

koji / buildvm-s390x-01.s390: Move this to a normal builder, remove from compose channel

Browse source 
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2019-10-02 22:14:42 +00:00 • committed by Pierre-Yves Chibon
parent 34df23a0e3
commit 8315ba9108
4 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
inventory/builders
View file

@ -286,7 +286,6 @@ buildvm-armv7-03.arm.fedoraproject.org
buildvm-ppc64le-01.stg.ppc.fedoraproject.org buildvm-ppc64le-01.stg.ppc.fedoraproject.org
buildvm-ppc64le-01.ppc.fedoraproject.org buildvm-ppc64le-01.ppc.fedoraproject.org
buildvm-ppc64le-02.ppc.fedoraproject.org buildvm-ppc64le-02.ppc.fedoraproject.org
buildvm-s390x-01.s390.fedoraproject.org
buildvm-s390x-01.stg.s390.fedoraproject.org buildvm-s390x-01.stg.s390.fedoraproject.org
buildvm-s390x-15.s390.fedoraproject.org buildvm-s390x-15.s390.fedoraproject.org
buildvm-s390x-16.s390.fedoraproject.org buildvm-s390x-16.s390.fedoraproject.org

2
playbooks/groups/buildvm.yml
View file

@ -185,7 +185,7 @@
- import_tasks: "{{ handlers_path }}/restart_services.yml" - import_tasks: "{{ handlers_path }}/restart_services.yml"
- name: configure sshfs on buildvm-s390x-01 - name: configure sshfs on buildvm-s390x-01
hosts: buildvm-s390x-01.s390.fedoraproject.org:buildvm-s390x-01.stg.s390.fedoraproject.org:buildvm-s390x-15.s390.fedoraproject.org:buildvm-s390x-16.s390.fedoraproject.org hosts: buildvm-s390x-01.stg.s390.fedoraproject.org:buildvm-s390x-15.s390.fedoraproject.org:buildvm-s390x-16.s390.fedoraproject.org
tags: tags:
- sshfs - sshfs
user: root user: root

2
roles/base/templates/iptables/iptables.kojibuilder
View file

@ -74,7 +74,7 @@
# SSH # SSH
-A INPUT -p tcp -m tcp -s 10.5.0.0/16 --dport 22 -j ACCEPT -A INPUT -p tcp -m tcp -s 10.5.0.0/16 --dport 22 -j ACCEPT
-A OUTPUT -p tcp -m tcp -d 10.5.0.0/16 --sport 22 -j ACCEPT -A OUTPUT -p tcp -m tcp -d 10.5.0.0/16 --sport 22 -j ACCEPT
{% if inventory_hostname.startswith (('buildvm-s390x-01.s390', 'buildvm-s390x-15', 'buildvm-s390x-16')) %} {% if inventory_hostname.startswith (('buildvm-s390x-15', 'buildvm-s390x-16')) %}
# Allow SSHFS binding to koji01 # Allow SSHFS binding to koji01
-A OUTPUT -p tcp -m tcp -d 10.5.125.61 --dport 22 -j ACCEPT -A OUTPUT -p tcp -m tcp -d 10.5.125.61 --dport 22 -j ACCEPT
{% endif %} {% endif %}

2
roles/koji_builder/tasks/main.yml
View file

@ -200,7 +200,7 @@
- name: make a mnt/koji link - name: make a mnt/koji link
file: state=link src=/mnt/fedora_koji/koji dest=/mnt/koji file: state=link src=/mnt/fedora_koji/koji dest=/mnt/koji
when: inventory_hostname.startswith(('buildvm-s390x-01.s390', 'buildvm-s390x-15', 'buildvm-s390x-16')) when: inventory_hostname.startswith(('buildvm-s390x-15', 'buildvm-s390x-16'))
tags: tags:
- koji_builder - koji_builder