From 20fd3619e6c687215d080ce6f8d7e234091d0f09 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 8 Jun 2020 15:40:39 -0700 Subject: [PATCH] iad2-move: drop all the cgit urls from our openshift apps Signed-off-by: Kevin Fenzi --- roles/openshift-apps/bodhi/templates/buildconfig.yml | 2 +- .../openshift-apps/fas/templates/buildconfig-fas.yml | 10 +++++----- .../fas/templates/buildconfig-totpcgi.yml | 12 ++++++------ .../fas/templates/buildconfig-yubikey.yml | 8 ++++---- .../openshift-apps/ipsilon/templates/buildconfig.yml | 12 ++++++------ 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/roles/openshift-apps/bodhi/templates/buildconfig.yml b/roles/openshift-apps/bodhi/templates/buildconfig.yml index e82d1d5fb8..8dec000e8c 100644 --- a/roles/openshift-apps/bodhi/templates/buildconfig.yml +++ b/roles/openshift-apps/bodhi/templates/buildconfig.yml @@ -15,7 +15,7 @@ items: name="bodhi-base" \ vendor="Fedora Infrastructure" \ license="MIT" - RUN curl -o /etc/yum.repos.d/infra-tags.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/fedora-infra-tags.repo + RUN curl -o /etc/yum.repos.d/infra-tags.repo https://infrastructure.fedoraproject.org/infra/ansible/files/common/fedora-infra-tags.repo # While dnf has a --nodocs, it doesen't have a --docs... RUN sed -i '/nodocs/d' /etc/dnf/dnf.conf RUN dnf install -y bodhi-server-{{bodhi_version}} bodhi-docs-{{bodhi_version}} python3-pyramid_sawing python3-gunicorn diff --git a/roles/openshift-apps/fas/templates/buildconfig-fas.yml b/roles/openshift-apps/fas/templates/buildconfig-fas.yml index b2b7cee000..0254fdcce5 100644 --- a/roles/openshift-apps/fas/templates/buildconfig-fas.yml +++ b/roles/openshift-apps/fas/templates/buildconfig-fas.yml @@ -9,12 +9,12 @@ spec: source: dockerfile: |- FROM registry.access.redhat.com/rhel6 - RUN curl -o /etc/yum.repos.d/rhel6.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/rhel6.repo && \ - curl -o /etc/yum.repos.d/epel6.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/epel6.repo && \ + RUN curl -o /etc/yum.repos.d/rhel6.repo https://infrastructure.fedoraproject.org/infra/ansible/files/common/rhel6.repo && \ + curl -o /etc/yum.repos.d/epel6.repo https://infrastructure.fedoraproject.org/infra/ansible/files/common/epel6.repo && \ {% if env == "staging" %} - curl -o /etc/yum.repos.d/infra-tags-stg.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/rhel-infra-tags-stg.repo && \ + curl -o /etc/yum.repos.d/infra-tags-stg.repo https://infrastructure.fedoraproject.org/infra/ansible/files/common/rhel-infra-tags-stg.repo && \ {% endif %} - curl -o /etc/yum.repos.d/infra-tags.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/rhel-infra-tags.repo + curl -o /etc/yum.repos.d/infra-tags.repo https://infrastructure.fedoraproject.org/infra/ansible/files/common/rhel-infra-tags.repo RUN yum install -y \ fas \ @@ -45,7 +45,7 @@ spec: ln -sf /usr/sbin/fas.wsgi /app/app.py RUN yum install -y patch && \ - curl https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/roles/fas_server/files/0001-bugfix.patch | patch /usr/lib/python2.6/site-packages/CherryPy-2.3.0-py2.6.egg/cherrypy/_cphttptools.py && \ + curl https://infrastructure.fedoraproject.org/infra/ansible/roles/fas_server/files/0001-bugfix.patch | patch /usr/lib/python2.6/site-packages/CherryPy-2.3.0-py2.6.egg/cherrypy/_cphttptools.py && \ rm -f /usr/lib/python2.6/site-packages/CherryPy-2.3.0-py2.6.egg/cherrypy/_cphttptools.py{c,o} diff --git a/roles/openshift-apps/fas/templates/buildconfig-totpcgi.yml b/roles/openshift-apps/fas/templates/buildconfig-totpcgi.yml index 1cef7ea660..d4db7b5be5 100644 --- a/roles/openshift-apps/fas/templates/buildconfig-totpcgi.yml +++ b/roles/openshift-apps/fas/templates/buildconfig-totpcgi.yml @@ -9,12 +9,12 @@ spec: source: dockerfile: |- FROM registry.access.redhat.com/rhel6 - RUN curl -v -o /etc/yum.repos.d/rhel6.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/rhel6.repo && \ - curl -v -o /etc/yum.repos.d/epel6.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/epel6.repo && \ + RUN curl -v -o /etc/yum.repos.d/rhel6.repo https://infrastructure.fedoraproject.org/infra/ansible/files/common/rhel6.repo && \ + curl -v -o /etc/yum.repos.d/epel6.repo https://infrastructure.fedoraproject.org/infra/ansible/files/common/epel6.repo && \ {% if env == "staging" %} - curl -v -o /etc/yum.repos.d/infra-tags-stg.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/rhel-infra-tags-stg.repo && \ + curl -v -o /etc/yum.repos.d/infra-tags-stg.repo https://infrastructure.fedoraproject.org/infra/ansible/files/common/rhel-infra-tags-stg.repo && \ {% endif %} - curl -v -o /etc/yum.repos.d/infra-tags.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/rhel-infra-tags.repo + curl -v -o /etc/yum.repos.d/infra-tags.repo https://infrastructure.fedoraproject.org/infra/ansible/files/common/rhel-infra-tags.repo RUN yum install -y \ mod_auth_pgsql \ @@ -26,8 +26,8 @@ spec: python-fedora \ python-psycopg2 - RUN curl https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/roles/totpcgi/files/index.cgi -o /var/www/totpcgi/index.cgi - RUN curl https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/roles/totpcgi/files/provisioning.cgi -o /var/www/totpcgi-provisioning/index.cgi + RUN curl https://infrastructure.fedoraproject.org/infra/ansible/roles/totpcgi/files/index.cgi -o /var/www/totpcgi/index.cgi + RUN curl https://infrastructure.fedoraproject.org/infra/ansible/roles/totpcgi/files/provisioning.cgi -o /var/www/totpcgi-provisioning/index.cgi RUN chmod -R o+rx /var/www/totpcgi* diff --git a/roles/openshift-apps/fas/templates/buildconfig-yubikey.yml b/roles/openshift-apps/fas/templates/buildconfig-yubikey.yml index 9ddbd84f58..317a8746d8 100644 --- a/roles/openshift-apps/fas/templates/buildconfig-yubikey.yml +++ b/roles/openshift-apps/fas/templates/buildconfig-yubikey.yml @@ -9,12 +9,12 @@ spec: source: dockerfile: |- FROM registry.access.redhat.com/rhel6 - RUN curl -o /etc/yum.repos.d/rhel6.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/rhel6.repo && \ - curl -o /etc/yum.repos.d/epel6.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/epel6.repo && \ + RUN curl -o /etc/yum.repos.d/rhel6.repo https://infrastructure.fedoraproject.org/infra/ansible/files/common/rhel6.repo && \ + curl -o /etc/yum.repos.d/epel6.repo https://infrastructure.fedoraproject.org/infra/ansible/files/common/epel6.repo && \ {% if env == "staging" %} - curl -o /etc/yum.repos.d/infra-tags-stg.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/rhel-infra-tags-stg.repo && \ + curl -o /etc/yum.repos.d/infra-tags-stg.repo https://infrastructure.fedoraproject.org/infra/ansible/files/common/rhel-infra-tags-stg.repo && \ {% endif %} - curl -o /etc/yum.repos.d/infra-tags.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/rhel-infra-tags.repo + curl -o /etc/yum.repos.d/infra-tags.repo https://infrastructure.fedoraproject.org/infra/ansible/files/common/rhel-infra-tags.repo RUN yum install -y \ httpd \ diff --git a/roles/openshift-apps/ipsilon/templates/buildconfig.yml b/roles/openshift-apps/ipsilon/templates/buildconfig.yml index a13b498dbd..c894c46975 100644 --- a/roles/openshift-apps/ipsilon/templates/buildconfig.yml +++ b/roles/openshift-apps/ipsilon/templates/buildconfig.yml @@ -9,9 +9,9 @@ spec: source: dockerfile: |- FROM fedora:31 - RUN curl -o /etc/yum.repos.d/infra-tags.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/fedora-infra-tags.repo + RUN curl -o /etc/yum.repos.d/infra-tags.repo https://infrastructure.fedoraproject.org/infra/ansible/files/common/fedora-infra-tags.repo {% if env == "staging" %} - RUN curl -o /etc/yum.repos.d/infra-tags-stg.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/fedora-infra-tags-stg.repo + RUN curl -o /etc/yum.repos.d/infra-tags-stg.repo https://infrastructure.fedoraproject.org/infra/ansible/files/common/fedora-infra-tags-stg.repo RUN curl -o /etc/yum.repos.d/fedora-updates-testing.repo https://src.fedoraproject.org/rpms/fedora-repos/raw/master/f/fedora-updates-testing.repo {% endif %} RUN dnf install -y \ @@ -35,12 +35,12 @@ spec: python3-mod_wsgi # Fedora specific stuff - Terrible hacky way to install, but works for testing purposes - RUN curl https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/roles/ipsilon/files/api.py -o /usr/lib/python3.7/site-packages/ipsilon/providers/openid/extensions/api.py && \ + RUN curl https://infrastructure.fedoraproject.org/infra/ansible/roles/ipsilon/files/api.py -o /usr/lib/python3.7/site-packages/ipsilon/providers/openid/extensions/api.py && \ {% for scope_file in oidc_scope_filenames %} - curl https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/roles/ipsilon/files/oidc_scopes/{{ scope_file }}.py -o /usr/lib/python3.7/site-packages/ipsilon/providers/openidc/plugins/{{scope_file}}.py && \ + curl https://infrastructure.fedoraproject.org/infra/ansible/roles/ipsilon/files/oidc_scopes/{{ scope_file }}.py -o /usr/lib/python3.7/site-packages/ipsilon/providers/openidc/plugins/{{scope_file}}.py && \ {% endfor %} - curl https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/roles/ipsilon/files/infofas.py -o /usr/lib/python3.7/site-packages/ipsilon/info/infofas.py && \ - curl https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/roles/ipsilon/files/py3-openid_server.py?1 -o /usr/lib/python3.7/site-packages/openid/server/server.py + curl https://infrastructure.fedoraproject.org/infra/ansible/roles/ipsilon/files/infofas.py -o /usr/lib/python3.7/site-packages/ipsilon/info/infofas.py && \ + curl https://infrastructure.fedoraproject.org/infra/ansible/roles/ipsilon/files/py3-openid_server.py?1 -o /usr/lib/python3.7/site-packages/openid/server/server.py # Set up krb5 RUN rm -f /etc/krb5.conf && ln -sf /etc/ipsilon/krb5.conf /etc/krb5.conf