Merge pull request #18 from grondo/testsuite-build-update

build/test: rename centos8 to el8, set automake foreign mode and drop redundant files
flux-framework · Feb 2, 2022 · e0b88dd · e0b88dd
2 parents 7ad3954 + 76ca7f2
commit e0b88dd
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 7 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -29,7 +29,7 @@ jobs:
     timeout-minutes: 30
     strategy:
       matrix:
-        image: ["centos8", "focal"]
+        image: ["el8", "focal"]
       fail-fast: false
     name: ${{ matrix.image }}
     steps:

diff --git a/.mergify.yml b/.mergify.yml
@@ -3,7 +3,7 @@ queue_rules:
     conditions:
       - base=master
       - status-success="validate commits"
-      - status-success="centos8"
+      - status-success="el8"
       - status-success="focal"
       - label="merge-when-passing"
       - label!="work-in-progress"

diff --git a/AUTHORS b/AUTHORS
diff --git a/COPYING b/COPYING
diff --git a/ChangeLog b/ChangeLog
diff --git a/NEWS b/NEWS
diff --git a/configure.ac b/configure.ac
@@ -6,9 +6,9 @@ AC_INIT([flux-coral2],
         m4_esyscmd([git describe --always | awk '/.*/ {sub(/^v/, ""); printf "%s",$1; exit}']))
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_MACRO_DIR([config])
-AC_CONFIG_SRCDIR([NEWS])
+AC_CONFIG_SRCDIR([NEWS.md])
 
-AM_INIT_AUTOMAKE([subdir-objects tar-ustar filename-length-max=256])
+AM_INIT_AUTOMAKE([subdir-objects tar-ustar filename-length-max=256 foreign])
 AM_SILENT_RULES([yes])
 AM_CONFIG_HEADER([config.h])
 AM_MAINTAINER_MODE([enable])

diff --git a/src/test/docker/centos8/Dockerfile → src/test/docker/el8/Dockerfile b/src/test/docker/centos8/Dockerfile → src/test/docker/el8/Dockerfile
@@ -1,4 +1,4 @@
-FROM fluxrm/flux-sched:centos8
+FROM fluxrm/flux-sched:el8
 
 ARG USER=fluxuser
 ARG UID=1000

diff --git a/src/test/docker/centos8/kubectl.sh → src/test/docker/el8/kubectl.sh b/src/test/docker/centos8/kubectl.sh → src/test/docker/el8/kubectl.sh
diff --git a/src/test/docker/centos8/sync-kube-config.sh → src/test/docker/el8/sync-kube-config.sh b/src/test/docker/centos8/sync-kube-config.sh → src/test/docker/el8/sync-kube-config.sh