Merge branch 'master' into fedora-update

Author: j-ogas

.github/workflows/main.yml

@@ -45,7 +45,7 @@ jobs:
       ch_prefix: /var/tmp
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: early setup & validation
         run: |
@@ -150,10 +150,11 @@ jobs:
         run: |
           set -x
           sudo apt-get install -y libfuse3-dev
-          # Currently we need the master branch of SquashFUSE.
           cd /usr/local/src
           git clone https://github.com/vasi/squashfuse.git
           cd squashfuse
+          # Check out the latest release.
+          git checkout $(git tag -l '[0-9].*' | sort -V | tail -1)
           ./autogen.sh
           ./configure --prefix=/usr/local
           make
@@ -186,28 +187,6 @@ jobs:
                      /usr/include/x86_64-linux-musl/
           sudo ln -s x86_64-linux-gnu/asm /usr/include/x86_64-linux-musl/
 
-      - name: install/configure dependencies, all Buildah
-        if: ${{ startsWith(matrix.builder, 'buildah') }}
-        run: |
-          command -v buildah
-          buildah --version
-          command -v runc
-          runc --version
-          # As of 2020-11-30, stock registries.conf is pretty simple; it
-          # includes Docker Hub (docker.io) and then quay.io. Still, use ours
-          # for stability.
-          cat /etc/containers/registries.conf
-          cat <<'EOF' | sudo tee /etc/containers/registries.conf
-          [registries.search]
-            registries = ['docker.io']
-          EOF
-
-      - name: install/configure dependencies, privileged Buildah
-        if: ${{ startsWith(matrix.builder, 'buildah-') }}
-        run: |
-          sudo usermod --add-subuids 10000-65536 $USER
-          sudo usermod --add-subgids 10000-65536 $USER
-
       - name: disable bundled lark, ch-image
         if: ${{    matrix.builder == 'ch-image'
                 && matrix.pack_fmt == 'squash-mount'
@@ -231,7 +210,7 @@ jobs:
           test -f ./lib/lark/lark.py
           make $ch_makej
           sudo make $ch_makej install
-          [[ $(bin/ch-image -v --dependencies) = 'lark path: /home/runner/work/charliecloud/charliecloud/lib/charliecloud/lark/__init__.py' ]]
+          [[ $(bin/ch-image -v --dependencies) = 'lark path: /home/runner/work/charliecloud/charliecloud/lib/lark/__init__.py' ]]
           [[ $($ch_prefix/from-git/bin/ch-image -v --dependencies) = 'lark path: /usr/local/lib/python3.10/dist-packages/lark/__init__.py' ]]
           make clean
           # no install, enable: build fails, untested
@@ -260,11 +239,18 @@ jobs:
           else
               LDD=ldd
           fi
-          ./configure --prefix=$ch_prefix/from-git
+          # Go wild with install directories to make sure it works (see #683).
+          # We do have a normal install below.
+          ./configure --prefix=$ch_prefix/from-git \
+                      --datarootdir=$ch_prefix/from-git_dataroot \
+                      --libexecdir=$ch_prefix/from-git_libexec \
+                      --libdir=$ch_prefix/from-git_lib \
+                      --mandir=$ch_prefix/from-git_man \
+                      --docdir=$ch_prefix/from-git_doc \
+                      --htmldir=$ch_prefix/from-git_html
           set -x
           fgrep 'documentation: yes' config.log
-          [[ $CH_TEST_BUILDER = buildah* ]] && fgrep 'with Buildah: yes' config.log
-          [[ $CH_TEST_BUILDER = docker ]] && fgrep 'with Docker: yes' config.log
+          [[ $CH_TEST_BUILDER = docker ]] && command -v docker
           if [[ $CH_TEST_BUILDER = ch-image ]]; then
               fgrep 'with ch-image(1): yes' config.log
               fgrep '"lark" module ... bundled' config.log
@@ -296,9 +282,9 @@ jobs:
         run: |
           set -x
           [[ $(bin/ch-image gestalt python-path) = /usr/bin/python3 ]]
-          [[ $(bin/ch-image -v --dependencies) = "lark path: /home/runner/work/charliecloud/charliecloud/lib/charliecloud/lark/__init__.py" ]]
+          [[ $(bin/ch-image -v --dependencies) = "lark path: /home/runner/work/charliecloud/charliecloud/lib/lark/__init__.py" ]]
           [[ $($ch_prefix/from-git/bin/ch-image gestalt python-path) = /usr/bin/python3 ]]
-          [[ $($ch_prefix/from-git/bin/ch-image -v --dependencies) = "lark path: /var/tmp/from-git/lib/charliecloud/lark/__init__.py" ]]
+          [[ $($ch_prefix/from-git/bin/ch-image -v --dependencies) = "lark path: /var/tmp/from-git_lib/charliecloud/lark/__init__.py" ]]
 
       - name: late setup & validation, all
         run: |
@@ -341,15 +327,15 @@ jobs:
           mv charliecloud-*.tar.gz $ch_prefix
           cd $ch_prefix
           tar xf charliecloud-*.tar.gz
-          rm charliecloud-*.tar.gz  # else cd fails with "too many arguments"
+          rm charliecloud-*.tar.gz  # else cd fails with “too many arguments”
           cd charliecloud-*
           pwd
           # Configure and verify output.
           ./configure --prefix=$ch_prefix/from-tarball
           set -x
           fgrep 'documentation: yes' config.log
-          [[ $CH_TEST_BUILDER = buildah* ]] && fgrep 'with Buildah: yes' config.log
-          [[ $CH_TEST_BUILDER = docker ]] && fgrep 'with Docker: yes' config.log
+          [[ $CH_TEST_BUILDER = buildah* ]] && command -v buildah
+          [[ $CH_TEST_BUILDER = docker ]] && command -v docker
           [[ $CH_TEST_BUILDER = ch-image ]] && fgrep 'with ch-image(1): yes' config.log
           fgrep 'recommended tests, tar-unpack mode: yes' config.log
           fgrep 'recommended tests, squash-unpack mode: yes' config.log
@@ -382,20 +368,39 @@ jobs:
       - name: run test suite (Git WD, standard)
         run: |
           bin/ch-test all
+          # Validate that “rootemu” test phase didn’t run (skipped by default
+          # on standard scope).
+          [[ $(cat /tmp/ch-test.tmp.$USER/rootemu) = no ]]
+
+      - name: run root emulation phase
+        if: ${{    matrix.builder == 'ch-image'
+                && matrix.pack_fmt == 'squash-mount'
+                && matrix.cache == 'enabled' }}
+        run: |
+          # We only really need to run the root emulation tests once in CI.
+          # ch-image with an enabled cache is required for these unit tests.
+          # Since all CI tests that use ch-image with an enabled cache take
+          # roughly the same amount of time, we arbitrarily chose squash-mount
+          # as the pack format.
+          bin/ch-test rootemu
+          # Validate that “rootemu” test phase ran.
+          [[ $(cat /tmp/ch-test.tmp.$USER/rootemu) = yes ]]
 
       - name: run test suite (installed from Git WD, standard)
         if: ${{    matrix.builder == 'ch-image'
                 && matrix.pack_fmt == 'squash-mount'
                 && matrix.cache == 'enabled' }}
         run: |
           $ch_prefix/from-git/bin/ch-test all
+          [[ $(cat /tmp/ch-test.tmp.$USER/rootemu) = no ]]
 
       - name: run test suite (installed from tarball, standard)
         if: ${{    matrix.builder == 'ch-image'
                 && matrix.pack_fmt == 'squash-mount'
                 && matrix.cache == 'enabled' }}
         run: |
           $ch_prefix/from-tarball/bin/ch-test all
+          [[ $(cat /tmp/ch-test.tmp.$USER/rootemu) = no ]]
 
       - name: uninstall from tarball
         if: ${{ matrix.keep_sudo }}
@@ -424,9 +429,10 @@ jobs:
           fgrep 'HTML documentation ... no' config.log
           fgrep 'man pages ... no' config.log
           fgrep 'ch-image(1) ... no' config.log
-          fgrep 'with Docker: yes' config.log
           fgrep 'with ch-image(1): no' config.log
-          fgrep 'basic tests, all stages: yes' config.log
+          # This CI test requires Docker, but the “configure” script doesn’t
+          # check for Docker, so we do it ourselves with “command -v”.
+          command -v docker
           fgrep 'more complete tests: no' config.log
           set +x
           # Build.
@@ -437,6 +443,7 @@ jobs:
         if: ${{ matrix.builder == 'docker' }}
         run: |
           bin/ch-test all
+          [[ $(cat /tmp/ch-test.tmp.$USER/rootemu) = no ]]
 
       - name: remove non-essential dependencies
         if: ${{ matrix.builder == 'docker' }}
@@ -462,8 +469,7 @@ jobs:
           ./configure --prefix=/doesnotexist
           set -x
           fgrep 'documentation: no' config.log
-          fgrep 'with Docker: yes' config.log
-          fgrep 'basic tests, all stages: yes' config.log
+          command -v docker
           fgrep 'more complete tests: no' config.log
           fgrep 'recommended tests, squash-mount mode: no' config.log
           set +x
@@ -475,6 +481,7 @@ jobs:
         if: ${{ matrix.builder == 'docker' }}
         run: |
           bin/ch-test all
+          [[ $(cat /tmp/ch-test.tmp.$USER/rootemu) = no ]]
 
       - name: print ending environment
         if: ${{ always() }}

.gitignore

@@ -5,7 +5,6 @@ a.out
 /bin/ch-image
 /bin/ch-run
 /bin/ch-run-oci
-/bin/ch-ssh
 /examples/copy/dirCa/symlink-to-dirCb
 /examples/copy/dirD/symlink-to-fileDa
 /examples/copy/dirEa/symlink-to-dirEb
@@ -20,19 +19,21 @@ a.out
 /doc/doctrees/
 /doc/html/
 /doc/man/*.[17]
-/lib/charliecloud
 /lib/contributors.bash
 /lib/lark
 /lib/lark-stubs
 /lib/lark*.dist-info
 /lib/version.py
 /lib/version.sh
 /lib/version.txt
-/test/build/61_force-auto.bats
+/test/build/30_doctest-auto.bats
+/test/force-auto.bats
 /test/docs-sane
+/test/doctest
 /test/fixtures/symlink-to-tmp
 /test/force-auto
 /test/make-perms-test
+/test/order-py
 /test/sotest/*.so*
 /test/sotest/sotest
 /test/sotest/bin/

Makefile.am

@@ -5,3 +5,24 @@ SUBDIRS = lib bin doc examples misc packaging test
 EXTRA_DIST = .github/PERUSEME .github/workflows/main.yml
 
 EXTRA_DIST += LICENSE README.rst VERSION autogen.sh
+
+# Embedded paths are in the source code suitable for running from the source
+# directory (i.e., without install). When installing, those paths are often
+# wrong, so re-write them with the correct paths we got from configure. Note:
+# Some variables are in both Python and sh, so we use syntax valid for both;
+# others are just sh.
+install-exec-hook:
+	@echo '### re-writing embedded paths ###'
+	for i in $(DESTDIR)@bindir@/ch-convert \
+	         $(DESTDIR)@bindir@/ch-fromhost \
+	         $(DESTDIR)@bindir@/ch-image \
+	         $(DESTDIR)@bindir@/ch-run-oci \
+	         $(DESTDIR)@bindir@/ch-test \
+	         $(DESTDIR)@libdir@/charliecloud/base.sh \
+	         $(DESTDIR)@libexecdir@/charliecloud/doctest; \
+	do \
+	  sed -Ei -e 's|^(ch_lib ?= ?).+/lib"?$$|\1"@libdir@/charliecloud"|' \
+	          -e 's|^(CHTEST_DIR=).+$$|\1@libexecdir@/charliecloud|' \
+	          -e 's|^(CHTEST_EXAMPLES_DIR=).+$$|\1@docdir@/examples|' \
+              $$i; \
+	done

README.rst

@@ -109,7 +109,7 @@ code. Please instead use the current number in the FAQ.
 Copyright and license
 ---------------------
 
-Charliecloud is copyright © 2014–2022 Triad National Security, LLC and others.
+Charliecloud is copyright © 2014–2023 Triad National Security, LLC and others.
 
 This software was produced under U.S. Government contract 89233218CNA000001
 for Los Alamos National Laboratory (LANL), which is operated by Triad National

VERSION

@@ -1 +1 @@
-0.33~pre
+0.36~pre

bin/Makefile.am

@@ -4,7 +4,7 @@
 
 ## C programs
 
-bin_PROGRAMS = ch-checkns ch-run ch-ssh
+bin_PROGRAMS = ch-checkns ch-run
 
 ch_checkns_SOURCES = ch-checkns.c ch_misc.h ch_misc.c
 
@@ -16,8 +16,6 @@ endif
 ch_run_CFLAGS = $(CFLAGS) $(PTHREAD_CFLAGS)
 ch_run_LDADD = $(CH_RUN_LIBS)
 
-ch_ssh_SOURCES = ch-ssh.c ch_misc.h ch_misc.c
-
 
 ## Shell scripts - distributed as-is