Merge pull request #3792 from op-jenkins/op-build-update_043_8-14-2020
op-build update 8-14-2020
diff --git a/ci/Dockerfile/fedora30.ppc64le b/ci/Dockerfile/fedora30.ppc64le
deleted file mode 120000
index eb88330..0000000
--- a/ci/Dockerfile/fedora30.ppc64le
+++ /dev/null
@@ -1 +0,0 @@
-fedora30
\ No newline at end of file
diff --git a/ci/Dockerfile/fedora30.x86_64 b/ci/Dockerfile/fedora30.x86_64
deleted file mode 120000
index eb88330..0000000
--- a/ci/Dockerfile/fedora30.x86_64
+++ /dev/null
@@ -1 +0,0 @@
-fedora30
\ No newline at end of file
diff --git a/ci/Dockerfile/fedora30 b/ci/Dockerfile/fedora32
similarity index 96%
rename from ci/Dockerfile/fedora30
rename to ci/Dockerfile/fedora32
index 86efa79..8074b38 100644
--- a/ci/Dockerfile/fedora30
+++ b/ci/Dockerfile/fedora32
@@ -1,4 +1,4 @@
-FROM fedora:30
+FROM fedora:32
RUN dnf -y install gcc-c++ flex bison git ctags cscope expat-devel patch \
zlib-devel zlib-static texinfo "perl(bigint)" "perl(XML::Simple)" \
"perl(YAML)" "perl(XML::SAX)" "perl(Fatal)" "perl(Thread::Queue)" \
diff --git a/ci/Dockerfile/fedora32.ppc64le b/ci/Dockerfile/fedora32.ppc64le
new file mode 120000
index 0000000..077cd0b
--- /dev/null
+++ b/ci/Dockerfile/fedora32.ppc64le
@@ -0,0 +1 @@
+fedora32
\ No newline at end of file
diff --git a/ci/Dockerfile/fedora32.x86_64 b/ci/Dockerfile/fedora32.x86_64
new file mode 120000
index 0000000..077cd0b
--- /dev/null
+++ b/ci/Dockerfile/fedora32.x86_64
@@ -0,0 +1 @@
+fedora32
\ No newline at end of file
diff --git a/ci/Dockerfile/ubuntu1804.ppc64le b/ci/Dockerfile/ubuntu1804.ppc64le
deleted file mode 120000
index 967c573..0000000
--- a/ci/Dockerfile/ubuntu1804.ppc64le
+++ /dev/null
@@ -1 +0,0 @@
-ubuntu1804
\ No newline at end of file
diff --git a/ci/Dockerfile/ubuntu1804.x86_64 b/ci/Dockerfile/ubuntu1804.x86_64
deleted file mode 120000
index 967c573..0000000
--- a/ci/Dockerfile/ubuntu1804.x86_64
+++ /dev/null
@@ -1 +0,0 @@
-ubuntu1804
\ No newline at end of file
diff --git a/ci/Dockerfile/ubuntu1804 b/ci/Dockerfile/ubuntu2004
similarity index 96%
rename from ci/Dockerfile/ubuntu1804
rename to ci/Dockerfile/ubuntu2004
index 91a1e22..32ee033 100644
--- a/ci/Dockerfile/ubuntu1804
+++ b/ci/Dockerfile/ubuntu2004
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
# Don't ask. Ubuntu is awful.
RUN sed -e 's/main$/main universe/' --in-place=orig /etc/apt/sources.list
RUN DEBIAN_FRONTEND=noninteractive apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -yy cscope ctags libz-dev libexpat-dev \
diff --git a/ci/Dockerfile/ubuntu2004.ppc64le b/ci/Dockerfile/ubuntu2004.ppc64le
new file mode 120000
index 0000000..16c11fa
--- /dev/null
+++ b/ci/Dockerfile/ubuntu2004.ppc64le
@@ -0,0 +1 @@
+ubuntu2004
\ No newline at end of file
diff --git a/ci/Dockerfile/ubuntu2004.x86_64 b/ci/Dockerfile/ubuntu2004.x86_64
new file mode 120000
index 0000000..16c11fa
--- /dev/null
+++ b/ci/Dockerfile/ubuntu2004.x86_64
@@ -0,0 +1 @@
+ubuntu2004
\ No newline at end of file
diff --git a/ci/build.sh b/ci/build.sh
index e0acc1a..0bbf140 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -3,7 +3,7 @@
set -ex
set -eo pipefail
-CONTAINERS="ubuntu1804 fedora30"
+CONTAINERS="ubuntu2004 fedora32"
SDK_ONLY=0
opt=$(getopt -o 's:Sab:p:c:hr' -- "$@")