From 97e764be2654548f2187dfc09e78f0be5c2a6b8b Mon Sep 17 00:00:00 2001 From: David Moreau-Simard Date: Wed, 6 Sep 2017 22:46:39 -0400 Subject: [PATCH] Add support for opensuse in configure-mirrors Change-Id: Ic73b502277314555513e548aafb9231550fa1401 --- roles/configure-mirrors/handlers/main.yaml | 7 +++++++ roles/configure-mirrors/tasks/mirror/Suse.yaml | 13 +++++++++++++ .../templates/etc/zypp/repos.d/repo-oss.repo.j2 | 8 ++++++++ .../templates/etc/zypp/repos.d/repo-update.repo.j2 | 8 ++++++++ roles/configure-mirrors/vars/Suse.yaml | 1 + zuul.yaml | 9 +++++++++ 6 files changed, 46 insertions(+) create mode 100644 roles/configure-mirrors/tasks/mirror/Suse.yaml create mode 100644 roles/configure-mirrors/templates/etc/zypp/repos.d/repo-oss.repo.j2 create mode 100644 roles/configure-mirrors/templates/etc/zypp/repos.d/repo-update.repo.j2 create mode 100644 roles/configure-mirrors/vars/Suse.yaml diff --git a/roles/configure-mirrors/handlers/main.yaml b/roles/configure-mirrors/handlers/main.yaml index ca6599efa..0b1352ac3 100644 --- a/roles/configure-mirrors/handlers/main.yaml +++ b/roles/configure-mirrors/handlers/main.yaml @@ -17,3 +17,10 @@ with_items: - yum clean all - yum makecache + +- name: Update zypper cache + become: yes + command: "{{ item }}" + with_items: + - zypper clean + - zypper refresh \ No newline at end of file diff --git a/roles/configure-mirrors/tasks/mirror/Suse.yaml b/roles/configure-mirrors/tasks/mirror/Suse.yaml new file mode 100644 index 000000000..7edef6c8a --- /dev/null +++ b/roles/configure-mirrors/tasks/mirror/Suse.yaml @@ -0,0 +1,13 @@ +- name: Install Suse repository files + become: yes + template: + dest: "/{{ item }}" + group: root + mode: 0644 + owner: root + src: "{{ item }}.j2" + with_items: + - etc/zypp/repos.d/repo-oss.repo + - etc/zypp/repos.d/repo-update.repo + notify: + - Update zypper cache diff --git a/roles/configure-mirrors/templates/etc/zypp/repos.d/repo-oss.repo.j2 b/roles/configure-mirrors/templates/etc/zypp/repos.d/repo-oss.repo.j2 new file mode 100644 index 000000000..f953b0a3f --- /dev/null +++ b/roles/configure-mirrors/templates/etc/zypp/repos.d/repo-oss.repo.j2 @@ -0,0 +1,8 @@ +# {{ ansible_managed }} +[repo-oss] +name=repo-oss +enabled=1 +autorefresh=0 +baseurl={{ package_mirror }}/distribution/leap/$releasever/repo/oss/ +type=yast2 +keeppackages=0 diff --git a/roles/configure-mirrors/templates/etc/zypp/repos.d/repo-update.repo.j2 b/roles/configure-mirrors/templates/etc/zypp/repos.d/repo-update.repo.j2 new file mode 100644 index 000000000..c21dbdaa5 --- /dev/null +++ b/roles/configure-mirrors/templates/etc/zypp/repos.d/repo-update.repo.j2 @@ -0,0 +1,8 @@ +# {{ ansible_managed }} +[repo-update] +name=repo-update +enabled=1 +autorefresh=0 +baseurl={{ package_mirror }}/update/leap/$releasever/oss/ +type=rpm-md +keeppackages=0 diff --git a/roles/configure-mirrors/vars/Suse.yaml b/roles/configure-mirrors/vars/Suse.yaml new file mode 100644 index 000000000..db29c7444 --- /dev/null +++ b/roles/configure-mirrors/vars/Suse.yaml @@ -0,0 +1 @@ +package_mirror: "http://{{ mirror_fqdn }}/opensuse" diff --git a/zuul.yaml b/zuul.yaml index 8a3e86a13..56b1bcca6 100644 --- a/zuul.yaml +++ b/zuul.yaml @@ -181,6 +181,13 @@ - name: fedora-26 label: fedora-26 +- job: + name: base-integration-opensuse423 + parent: base-integration + nodes: + - name: opensuse-423 + label: opensuse-423 + - job: name: base-integration-ubuntu-trusty parent: base-integration @@ -204,6 +211,7 @@ - base-integration-fedora-26 - base-integration-ubuntu-trusty - base-integration-ubuntu-xenial + - base-integration-opensuse423 gate: jobs: - base-integration-centos-7 @@ -211,3 +219,4 @@ - base-integration-fedora-26 - base-integration-ubuntu-trusty - base-integration-ubuntu-xenial + - base-integration-opensuse423