summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--inventory/group_vars/qa-prod3
-rw-r--r--inventory/group_vars/qa-stg4
-rw-r--r--inventory/group_vars/resultsdb-dev3
-rw-r--r--inventory/group_vars/resultsdb-stg4
-rw-r--r--inventory/group_vars/taskotron-dev4
-rw-r--r--inventory/group_vars/taskotron-stg3
-rw-r--r--playbooks/hosts/testdays.fedorainfracloud.org.yml11
7 files changed, 0 insertions, 32 deletions
diff --git a/inventory/group_vars/qa-prod b/inventory/group_vars/qa-prod
index 4f8162078..fb269bf61 100644
--- a/inventory/group_vars/qa-prod
+++ b/inventory/group_vars/qa-prod
@@ -24,9 +24,6 @@ deployment_type: qa-prod
tcp_ports: [ 80, "{{ buildslave_port }}", 222]
-# this enables infrastructure-testing repo
-extra_enablerepos: 'infrastructure-testing'
-
################################################################################
# Buildbot Settings
################################################################################
diff --git a/inventory/group_vars/qa-stg b/inventory/group_vars/qa-stg
index 9c4c2c77a..c2450705f 100644
--- a/inventory/group_vars/qa-stg
+++ b/inventory/group_vars/qa-stg
@@ -9,10 +9,6 @@ num_cpus: 1
fas_client_groups: sysadmin-qa,sysadmin-main,fi-apprentice,sysadmin-noc,sysadmin-veteran
-
-# this enables infrastructure-testing repo
-extra_enablerepos: 'infrastructure-testing'
-
sshd_config: ssh/sshd_config.qa-stg
sshd_port: 222
external_hostname: qa.stg.fedoraproject.org
diff --git a/inventory/group_vars/resultsdb-dev b/inventory/group_vars/resultsdb-dev
index 7f4ed65aa..4662aff9e 100644
--- a/inventory/group_vars/resultsdb-dev
+++ b/inventory/group_vars/resultsdb-dev
@@ -9,9 +9,6 @@ tcp_ports: [ 80, 443, "{{ resultsdb_db_port }}", "{{ execdb_db_port }}" ]
external_hostname: taskotron-dev.fedoraproject.org
deployment_type: dev
-extra_enablerepos: 'infrastructure-testing'
-
-
############################################################
# resultsdb details
############################################################
diff --git a/inventory/group_vars/resultsdb-stg b/inventory/group_vars/resultsdb-stg
index b433c8dae..d834f9c64 100644
--- a/inventory/group_vars/resultsdb-stg
+++ b/inventory/group_vars/resultsdb-stg
@@ -9,10 +9,6 @@ tcp_ports: [ 80, 443, "{{ resultsdb_db_port }}" ]
external_hostname: taskotron.stg.fedoraproject.org
deployment_type: stg
-# this enables extra repos during dnf install but that's broken right now, remember to re-enable
-# extra_enablerepos: 'infrastructure-testing'
-extra_enablerepos: 'infrastructure-testing'
-
# make sure we're using the stg fedsmg bus
fedmsg_env: stg
diff --git a/inventory/group_vars/taskotron-dev b/inventory/group_vars/taskotron-dev
index 6f860cbc8..637ca0408 100644
--- a/inventory/group_vars/taskotron-dev
+++ b/inventory/group_vars/taskotron-dev
@@ -11,10 +11,6 @@ external_hostname: taskotron-dev.fedoraproject.org
deployment_type: dev
robots_path: /var/www/html
-# this enables extra repos during dnf operations
-extra_enablerepos: 'infrastructure-testing'
-
-
############################################################
# task repo details
############################################################
diff --git a/inventory/group_vars/taskotron-stg b/inventory/group_vars/taskotron-stg
index 287c69bd8..46be4b546 100644
--- a/inventory/group_vars/taskotron-stg
+++ b/inventory/group_vars/taskotron-stg
@@ -10,9 +10,6 @@ external_hostname: taskotron.stg.fedoraproject.org
deployment_type: stg
robots_path: /var/www/html
-# this enables extra repos during dnf operations
-extra_enablerepos: 'infrastructure-testing'
-
# decide whether to use prod or stg fedsmg bus
fedmsg_env: prod
diff --git a/playbooks/hosts/testdays.fedorainfracloud.org.yml b/playbooks/hosts/testdays.fedorainfracloud.org.yml
index f8b6287c3..1a90414d0 100644
--- a/playbooks/hosts/testdays.fedorainfracloud.org.yml
+++ b/playbooks/hosts/testdays.fedorainfracloud.org.yml
@@ -26,17 +26,6 @@
- name: set hostname (required by some services, at least postfix need it)
hostname: name="{{inventory_hostname}}"
- tasks:
- - name: add infrastructure repo
- copy: src="{{ files }}/common/{{ item }}" dest="/etc/yum.repos.d/{{ item }}"
- with_items:
- - infrastructure.repo
- - infrastructure-testing.repo
- tags:
- - config
- - packages
- - yumrepos
-
roles:
- postgresql_server