Browse Source

Merge "Update to Fedora 29"

tags/2.19.0
Zuul 5 months ago
parent
commit
234f000e6b

+ 1
- 1
diskimage_builder/elements/fedora-minimal/environment.d/10-fedora-distro-name.bash View File

@@ -1,2 +1,2 @@
1 1
 export DISTRO_NAME=fedora
2
-export DIB_RELEASE=${DIB_RELEASE:-28}
2
+export DIB_RELEASE=${DIB_RELEASE:-29}

+ 4
- 4
diskimage_builder/elements/fedora/environment.d/10-fedora-distro-name.bash View File

@@ -1,5 +1,5 @@
1 1
 export DISTRO_NAME=fedora
2
-export DIB_RELEASE=${DIB_RELEASE:-28}
2
+export DIB_RELEASE=${DIB_RELEASE:-29}
3 3
 
4 4
 # Note the filename URL has a "sub-release" in it
5 5
 #  http:// ... Fedora-Cloud-Base-25-1.3.x86_64.qcow2
@@ -11,10 +11,10 @@ export DIB_RELEASE=${DIB_RELEASE:-28}
11 11
 #
12 12
 # [1] https://lists.fedoraproject.org/archives/list/cloud@lists.fedoraproject.org/thread/2WFO2FKIGUQYRQXIR35UVJGRHF7LQENJ/
13 13
 
14
-if [[ ${DIB_RELEASE} == '27' ]]; then
15
-    export DIB_FEDORA_SUBRELEASE=1.6
16
-elif [[ ${DIB_RELEASE} == '28' ]]; then
14
+if [[ ${DIB_RELEASE} == '28' ]]; then
17 15
     export DIB_FEDORA_SUBRELEASE=1.1
16
+elif [[ ${DIB_RELEASE} == '29' ]]; then
17
+    export DIB_FEDORA_SUBRELEASE=1.2
18 18
 else
19 19
     echo "Unsupported Fedora release"
20 20
     exit 1

+ 2
- 2
doc/source/user_guide/supported_distros.rst View File

@@ -5,7 +5,7 @@ Distributions which are supported as a build host:
5 5
 
6 6
 - Centos 6, 7
7 7
 - Debian 8 ("jessie")
8
-- Fedora 27, 28
8
+- Fedora 28, 29
9 9
 - RHEL 6, 7
10 10
 - Ubuntu 14.04 ("trusty")
11 11
 - Gentoo
@@ -16,7 +16,7 @@ Distributions which are supported as a target for an image:
16 16
 
17 17
 - Centos 6, 7
18 18
 - Debian 8 ("jessie")
19
-- Fedora 27, 28
19
+- Fedora 28, 29
20 20
 - RHEL 6, 7
21 21
 - Ubuntu 12.04 ("precise"), 14.04 ("trusty")
22 22
 - Gentoo

+ 3
- 2
roles/dib-setup-gate-mirrors/tasks/main.yaml View File

@@ -28,9 +28,10 @@
28 28
     state: directory
29 29
     mode: 0775
30 30
     recurse: yes
31
+  # sometimes Fedora moves things and we need different versions; keep
32
+  # the loops for future use.
31 33
   with_items:
32 34
     - default
33
-    - '28'
34 35
 
35 36
 - name: Install fedora-minimal repo files
36 37
   template:
@@ -38,5 +39,5 @@
38 39
     mode: 0644
39 40
     src: "fedora-minimal/{{ item[0] }}/{{ item[1] }}.j2"
40 41
   with_nested:
41
-    - [ 'default', '28' ]
42
+    - [ 'default' ]
42 43
     - [ 'fedora.repo', 'fedora-updates.repo' ]

+ 0
- 10
roles/dib-setup-gate-mirrors/templates/fedora-minimal/28/fedora-updates.repo.j2 View File

@@ -1,10 +0,0 @@
1
-[updates]
2
-name=Fedora $releasever - $basearch - Updates
3
-failovermethod=priority
4
-baseurl=http://{{ mirror_fqdn }}/fedora/updates/$releasever/Everything/$basearch/
5
-enabled=1
6
-gpgcheck=0
7
-metadata_expire=6h
8
-skip_if_unavailable=False
9
-deltarpm=False
10
-deltarpm_percentage=0

+ 0
- 10
roles/dib-setup-gate-mirrors/templates/fedora-minimal/28/fedora.repo.j2 View File

@@ -1,10 +0,0 @@
1
-[fedora]
2
-name=Fedora $releasever - $basearch
3
-failovermethod=priority
4
-baseurl=http://{{ mirror_fqdn }}/fedora/releases/$releasever/Everything/$basearch/os/
5
-enabled=1
6
-metadata_expire=7d
7
-gpgcheck=0
8
-skip_if_unavailable=False
9
-deltarpm=False
10
-deltarpm_percentage=0

+ 1
- 1
roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora-updates.repo.j2 View File

@@ -1,7 +1,7 @@
1 1
 [updates]
2 2
 name=Fedora $releasever - $basearch - Updates
3 3
 failovermethod=priority
4
-baseurl=http://{{ mirror_fqdn }}/fedora/updates/$releasever/$basearch/
4
+baseurl=http://{{ mirror_fqdn }}/fedora/updates/$releasever/Everything/$basearch/
5 5
 enabled=1
6 6
 gpgcheck=0
7 7
 metadata_expire=6h

Loading…
Cancel
Save