summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@fedoraproject.org>2017-04-12 09:19:13 +0000
committerPeter Robinson <pbrobinson@fedoraproject.org>2017-04-12 09:19:13 +0000
commit7ca68c5311a1fc1c94e2bc72f3cfb58438afbeec (patch)
tree7b5d68027cb88759fd358669f7e239327fafddf2
parentd20a648fad7b7c2aee0eb8a1e0a5cacacdb4d037 (diff)
downloadansible-7ca68c5311a1fc1c94e2bc72f3cfb58438afbeec.tar.gz
ansible-7ca68c5311a1fc1c94e2bc72f3cfb58438afbeec.tar.xz
ansible-7ca68c5311a1fc1c94e2bc72f3cfb58438afbeec.zip
update s390-compose for f26
-rw-r--r--inventory/host_vars/compose-s390-01.s390.fedoraproject.org4
-rw-r--r--roles/releng/files/s390.branched2
2 files changed, 3 insertions, 3 deletions
diff --git a/inventory/host_vars/compose-s390-01.s390.fedoraproject.org b/inventory/host_vars/compose-s390-01.s390.fedoraproject.org
index 5cf96ce1b..4826351c8 100644
--- a/inventory/host_vars/compose-s390-01.s390.fedoraproject.org
+++ b/inventory/host_vars/compose-s390-01.s390.fedoraproject.org
@@ -1,8 +1,8 @@
---
vmhost: virthost-s390.s390.fedoraproject.org
volgroup: /dev/vg_guests
-ks_url: http://10.5.126.23/repo/rhel/ks/buildvm-fedora-24
-ks_repo: http://10.5.126.23/pub/fedora/linux/releases/24/Everything/x86_64/os/
+ks_url: http://10.5.126.23/repo/rhel/ks/buildvm-fedora-25
+ks_repo: http://10.5.126.23/pub/fedora/linux/releases/25/Everything/x86_64/os/
virt_install_command: "{{ virt_install_command_one_nic }}"
eth0_ip: 10.5.129.16
diff --git a/roles/releng/files/s390.branched b/roles/releng/files/s390.branched
index e51bdbf30..c1adddb18 100644
--- a/roles/releng/files/s390.branched
+++ b/roles/releng/files/s390.branched
@@ -1,3 +1,3 @@
# branched devel compose
MAILTO=releng-cron@lists.fedoraproject.org
-#15 11 * * * root TMPDIR=`mktemp -d /tmp/branched.XXXXXX` && cd $TMPDIR && git clone https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f25-secondary-arch && LANG=en_US.UTF-8 ./nightly.sh s390
+15 11 * * * root TMPDIR=`mktemp -d /tmp/branched.XXXXXX` && cd $TMPDIR && git clone https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f26-secondary-arch && LANG=en_US.UTF-8 ./nightly.sh s390