diff mbox series

[1/3] travis: remove obsolete fedora 24,25,26

Message ID 20180504063415.29047-1-stewart@linux.ibm.com
State Accepted
Headers show
Series [1/3] travis: remove obsolete fedora 24,25,26 | expand

Commit Message

Stewart Smith May 4, 2018, 6:34 a.m. UTC
Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
---
 .travis.yml                                      | 7 -------
 opal-ci/Dockerfile-fedora-rawhide                | 2 +-
 opal-ci/Dockerfile-fedora24                      | 7 -------
 opal-ci/Dockerfile-fedora25                      | 7 -------
 opal-ci/Dockerfile-fedora26                      | 7 -------
 opal-ci/Dockerfile-fedora27                      | 2 +-
 opal-ci/{build-fedora24.sh => build-fedora27.sh} | 0
 7 files changed, 2 insertions(+), 30 deletions(-)
 delete mode 100644 opal-ci/Dockerfile-fedora24
 delete mode 100644 opal-ci/Dockerfile-fedora25
 delete mode 100644 opal-ci/Dockerfile-fedora26
 rename opal-ci/{build-fedora24.sh => build-fedora27.sh} (100%)

Comments

Stewart Smith May 6, 2018, 5:18 p.m. UTC | #1
Stewart Smith <stewart@linux.ibm.com> writes:
> Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
> ---
>  .travis.yml                                      | 7 -------
>  opal-ci/Dockerfile-fedora-rawhide                | 2 +-
>  opal-ci/Dockerfile-fedora24                      | 7 -------
>  opal-ci/Dockerfile-fedora25                      | 7 -------
>  opal-ci/Dockerfile-fedora26                      | 7 -------
>  opal-ci/Dockerfile-fedora27                      | 2 +-
>  opal-ci/{build-fedora24.sh => build-fedora27.sh} | 0
>  7 files changed, 2 insertions(+), 30 deletions(-)
>  delete mode 100644 opal-ci/Dockerfile-fedora24
>  delete mode 100644 opal-ci/Dockerfile-fedora25
>  delete mode 100644 opal-ci/Dockerfile-fedora26
>  rename opal-ci/{build-fedora24.sh => build-fedora27.sh} (100%)

merged to master as of a3b0ce167d6dc01fc158d965bf74eef74a44b49e
diff mbox series

Patch

diff --git a/.travis.yml b/.travis.yml
index e68c9151f69c..c754c12ac298 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,9 +13,6 @@  env:
     - RUN_ON_CONTAINER=ubuntu-latest
     - RUN_ON_CONTAINER=centos6
     - RUN_ON_CONTAINER=centos7
-    - RUN_ON_CONTAINER=fedora24
-    - RUN_ON_CONTAINER=fedora25
-    - RUN_ON_CONTAINER=fedora26
     - RUN_ON_CONTAINER=fedora27
     - RUN_ON_CONTAINER=fedora-rawhide
     - RUN_ON_CONTAINER=debian-stretch
@@ -32,10 +29,6 @@  matrix:
   exclude:
     - os: linux-ppc64le
       env: RUN_ON_CONTAINER=ubuntu-12.04
-    - os: linux-ppc64le
-      env: RUN_ON_CONTAINER=fedora24
-    - os: linux-ppc64le
-      env: RUN_ON_CONTAINER=fedora25
     - os: linux-ppc64le
       env: RUN_ON_CONTAINER=centos6
     - os: linux-ppc64le
diff --git a/opal-ci/Dockerfile-fedora-rawhide b/opal-ci/Dockerfile-fedora-rawhide
index 7413a58e7dc1..4bfdd57a6a77 100644
--- a/opal-ci/Dockerfile-fedora-rawhide
+++ b/opal-ci/Dockerfile-fedora-rawhide
@@ -4,4 +4,4 @@  RUN dnf -y install gcc-powerpc64-linux-gnu
 RUN if [ `arch` == "x86_64" ]; then dnf -y install http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0.f22.x86_64.rpm; fi
 COPY . /build/
 WORKDIR /build
-ENTRYPOINT ./opal-ci/build-fedora24.sh
+ENTRYPOINT ./opal-ci/build-fedora27.sh
diff --git a/opal-ci/Dockerfile-fedora24 b/opal-ci/Dockerfile-fedora24
deleted file mode 100644
index 06e1b0f94eae..000000000000
--- a/opal-ci/Dockerfile-fedora24
+++ /dev/null
@@ -1,7 +0,0 @@ 
-FROM fedora:24
-RUN dnf -y install wget curl xterm gcc git xz make diffutils findutils expect valgrind valgrind-devel ccache dtc openssl-devel openssl
-RUN dnf -y install gcc-powerpc64-linux-gnu 
-RUN dnf -y install http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0.f22.x86_64.rpm
-COPY . /build/
-WORKDIR /build
-ENTRYPOINT ./opal-ci/build-fedora24.sh
diff --git a/opal-ci/Dockerfile-fedora25 b/opal-ci/Dockerfile-fedora25
deleted file mode 100644
index 32dead5823a1..000000000000
--- a/opal-ci/Dockerfile-fedora25
+++ /dev/null
@@ -1,7 +0,0 @@ 
-FROM fedora:25
-RUN dnf -y install wget curl xterm gcc git xz make diffutils findutils expect valgrind valgrind-devel ccache dtc openssl-devel
-RUN dnf -y install gcc-powerpc64-linux-gnu 
-RUN dnf -y install http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0.f22.x86_64.rpm
-COPY . /build/
-WORKDIR /build
-ENTRYPOINT ./opal-ci/build-fedora24.sh
diff --git a/opal-ci/Dockerfile-fedora26 b/opal-ci/Dockerfile-fedora26
deleted file mode 100644
index 3cb66f33c67c..000000000000
--- a/opal-ci/Dockerfile-fedora26
+++ /dev/null
@@ -1,7 +0,0 @@ 
-FROM fedora:26
-RUN dnf -y install wget curl xterm gcc git xz make diffutils findutils expect valgrind valgrind-devel ccache dtc openssl-devel
-RUN dnf -y install gcc-powerpc64-linux-gnu 
-RUN if [ `arch` == "x86_64" ]; then dnf -y install http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0.f22.x86_64.rpm; fi
-COPY . /build/
-WORKDIR /build
-ENTRYPOINT ./opal-ci/build-fedora24.sh
diff --git a/opal-ci/Dockerfile-fedora27 b/opal-ci/Dockerfile-fedora27
index 770220bc9db0..969c6d4e1eb8 100644
--- a/opal-ci/Dockerfile-fedora27
+++ b/opal-ci/Dockerfile-fedora27
@@ -4,4 +4,4 @@  RUN dnf -y install gcc-powerpc64-linux-gnu
 RUN if [ `arch` == "x86_64" ]; then dnf -y install http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0.f22.x86_64.rpm; fi
 COPY . /build/
 WORKDIR /build
-ENTRYPOINT ./opal-ci/build-fedora24.sh
+ENTRYPOINT ./opal-ci/build-fedora27.sh
diff --git a/opal-ci/build-fedora24.sh b/opal-ci/build-fedora27.sh
similarity index 100%
rename from opal-ci/build-fedora24.sh
rename to opal-ci/build-fedora27.sh