From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Sun, 8 Nov 2020 14:11:43 +0000 (+0100)
Subject: f33
X-Git-Url: http://git.onelab.eu/?p=build.git;a=commitdiff_plain;h=5d0f2ee2524724a97c0b8505fe784a8da9b12c6d

f33
---

diff --git a/Makefile b/Makefile
index a48654e1..d4ccf47e 100644
--- a/Makefile
+++ b/Makefile
@@ -348,7 +348,7 @@ header.spec:
 	echo "%global _source_filedigest_algorithm 1" >> $@
 	echo "%global _source_payload       w9.gzdio" >> $@
 	echo "%global _binary_payload       w9.gzdio" >> $@
-ifeq "$(DISTRONAME)""$(filter $(DISTRONAME),f25 f27 f29 f31)"
+ifeq "$(DISTRONAME)""$(filter $(DISTRONAME),f25 f27 f29 f31 f33)"
 	echo "%define debug_package %{nil}" >> $@
 endif
 
diff --git a/create-vm.sh b/create-vm.sh
index 7027276a..49260682 100755
--- a/create-vm.sh
+++ b/create-vm.sh
@@ -3,6 +3,23 @@
 COMMAND=$(basename $0)
 DIRNAME=$(dirname $0)
 
+# NOTE - April 2020
+# this whole lot won't work well with ubuntu containers any longer
+# tried with webprivacy on bionic, and
+# (*) the initial populating phase somehow spawned a question screen
+#     something about asking questions during upgrades..
+#     so I had to turn off the redirection into ~/machines/<container>.log
+# (*) more badly, the resulting container does not start its network upon boot
+#     everything is in place and it could be started manually 
+#     like for the record e.g.
+#         ip link set dev eth0 up
+#         ip address add 138.96.119.13/21 dev eth0
+#         ip route add default dev eth0 via 138.96.112.250
+#         ping -c 1 8.8.8.8
+# trying to solve that last issue by apt-get install'ing network-manager
+# (which was missing indeed) was not enough 
+# a bit more work seems to be needed if that became needed 
+
 BUILD="${HOME}/git-build"
 
 LOGS=$HOME/machines
@@ -11,7 +28,7 @@ LOGS=$HOME/machines
 
 DOMAIN=pl.sophia.inria.fr
 
-DEFAULT_DISTRO=f31
+DEFAULT_DISTRO=f33
 DEFAULT_MEMORY=16384
 
 CONFIRM=
diff --git a/fedora-mirror.sh b/fedora-mirror.sh
index 4ef4239e..7952453e 100755
--- a/fedora-mirror.sh
+++ b/fedora-mirror.sh
@@ -16,8 +16,8 @@ root=/mirror/
 us_fedora_url=rsync://mirrors.kernel.org/fedora
 eu_fedora_url=rsync://mirror1.hs-esslingen.de/fedora/linux
 
-default_distroname="f31"
-all_distronames="f29 f31"
+default_distroname="f33"
+all_distronames="f31 f33"
 
 global_arch="x86_64"
 
diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh
index df10e8ec..8a97233c 100755
--- a/lbuild-initvm.sh
+++ b/lbuild-initvm.sh
@@ -30,7 +30,7 @@ function lxcroot () {
 
 # XXX fixme : when creating a 32bits VM we need to call linux32 as appropriate...s
 
-DEFAULT_FCDISTRO=f31
+DEFAULT_FCDISTRO=f33
 DEFAULT_PLDISTRO=lxc
 DEFAULT_PERSONALITY=linux64
 DEFAULT_MEMORY=3072
diff --git a/lbuild-nightly.sh b/lbuild-nightly.sh
index 1d115e9c..188cb8af 100755
--- a/lbuild-nightly.sh
+++ b/lbuild-nightly.sh
@@ -11,7 +11,7 @@ COMMAND=$(basename $0)
 export PATH=$PATH:/bin:/sbin
 
 # default values, tunable with command-line options
-DEFAULT_FCDISTRO=f31
+DEFAULT_FCDISTRO=f33
 DEFAULT_PLDISTRO=lxc
 DEFAULT_PERSONALITY=linux64
 DEFAULT_MAILDEST="build at onelab.eu"
diff --git a/lxc.mk b/lxc.mk
index f8332831..c3d75a3b 100644
--- a/lxc.mk
+++ b/lxc.mk
@@ -24,7 +24,7 @@ IN_NODEIMAGE += lxc-userspace
 # with 4.19, the jprobe api has gone entirely
 # https://github.com/torvalds/linux/commit/4de58696de076d9bd2745d1cbe0930635c3f5ac9
 #
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f29 f31)"
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f29 f31 f33)"
 #
 transforward-MODULES := transforward
 transforward-SPEC := transforward.spec
@@ -172,7 +172,7 @@ ALL += bind_public
 
 # in fedora 29, this triggers nasty-looking compile messages
 # not trying too hard, we're mostly after the server-side of f29 and above
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f29 f31)"
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME), f29 f31 f33)"
 #
 # sliver-openvswitch
 #
diff --git a/mirroring/f33/yum.repos.d/building.repo.in b/mirroring/f33/yum.repos.d/building.repo.in
new file mode 100644
index 00000000..487ad185
--- /dev/null
+++ b/mirroring/f33/yum.repos.d/building.repo.in
@@ -0,0 +1,23 @@
+[fedora]
+name=Fedora 33 - $basearch
+baseurl=@MIRRORURL@/fedora/releases/33/Everything/$basearch/os/
+enabled=1
+metadata_expire=7d
+gpgcheck=1
+gpgkey=http://mirror.onelab.eu/keys/RPM-GPG-KEY-fedora-33-primary
+
+[updates]
+name=Fedora 33 - $basearch - Updates
+baseurl=@MIRRORURL@/fedora/updates/33/Everything/$basearch/
+enabled=1
+metadata_expire=7d
+gpgcheck=1
+gpgkey=http://mirror.onelab.eu/keys/RPM-GPG-KEY-fedora-33-primary
+
+[modular]
+name=Fedora 33 - $basearch - Updates
+baseurl=@MIRRORURL@/fedora/updates/33/Modular/$basearch/
+enabled=1
+metadata_expire=7d
+gpgcheck=1
+gpgkey=http://mirror.onelab.eu/keys/RPM-GPG-KEY-fedora-33-primary
diff --git a/pkgs.py b/pkgs.py
index 3087493e..facc420b 100755
--- a/pkgs.py
+++ b/pkgs.py
@@ -36,13 +36,14 @@ import re
 
 default_arch = 'x86_64'
 known_archs = ['i386', 'i686', 'x86_64']
-default_fcdistro = 'f31'
+default_fcdistro = 'f33'
 known_fcdistros = [
     'centos5', 'centos6',
     # oldies but we have references to that in the pkgs files
-    'f8', 'f10', 'f12', 'f14', 'f16', 'f18', 'f20', 'f21', 'f22', 'f23', 'f24',
+    'f8', 'f10', 'f12', 'f14', 'f16', 'f18', 
+    'f20', 'f21', 'f22', 'f23', 'f24', 'f25', 'f27', 
     # these ones are still relevant
-    'f25', 'f27', 'f29', 'f31',
+    'f29', 'f31', 'f33',
     # scientific linux
     'sl6',
     # debians