diff --git a/.mergify.yml b/.mergify.yml index 936482e97..b1d0c3526 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -6,9 +6,9 @@ queue_rules: - status-success="spelling" - status-success="python format" - status-success="python lint" - - status-success="bionic - gcc-8,distcheck" - - status-success="bionic - clang-6.0" - - status-success="bionic - test-install" + - status-success="jammy - gcc-8,distcheck" + - status-success="jammy - clang-6.0" + - status-success="jammy - test-install" - status-success="focal" - status-success="el7" - status-success="el8" diff --git a/src/test/docker-deploy.sh b/src/test/docker-deploy.sh index c76e60db6..d1cd10ddf 100755 --- a/src/test/docker-deploy.sh +++ b/src/test/docker-deploy.sh @@ -20,8 +20,8 @@ echo $DOCKER_PASSWORD | docker login -u "$DOCKER_USERNAME" --password-stdin log "docker push ${DOCKER_TAG}" docker push ${DOCKER_TAG} -# If this is the bionic build, then also tag without image name: -if echo "$DOCKER_TAG" | grep -q "bionic"; then +# If this is the jammy build, then also tag without image name: +if echo "$DOCKER_TAG" | grep -q "jammy"; then t="${DOCKER_REPO}:${GITHUB_TAG:-latest}" log "docker push ${t}" docker tag "$DOCKER_TAG" ${t} && docker push ${t} diff --git a/src/test/docker/docker-run-checks.sh b/src/test/docker/docker-run-checks.sh index 2582726d8..f27a537bd 100755 --- a/src/test/docker/docker-run-checks.sh +++ b/src/test/docker/docker-run-checks.sh @@ -10,7 +10,7 @@ PROJECT=flux-sched BASE_DOCKER_REPO=fluxrm/flux-core -IMAGE=bionic +IMAGE=jammy JOBS=2 MOUNT_HOME_ARGS="--volume=$HOME:/home/$USER -e HOME" diff --git a/src/test/generate-matrix.py b/src/test/generate-matrix.py index 99a3ea8a3..1b5b0b7b7 100755 --- a/src/test/generate-matrix.py +++ b/src/test/generate-matrix.py @@ -45,7 +45,7 @@ def create_docker_tag(self, image, env, command): def add_build( self, name=None, - image="bionic", + image="jammy", args=default_args, jobs=4, env=None, @@ -104,7 +104,7 @@ def __str__(self): # Ubuntu: gcc-8, distcheck matrix.add_build( - name="bionic - gcc-8,distcheck", + name="jammy - gcc-8,distcheck", env=dict( CC="gcc-8", CXX="g++-8", @@ -118,7 +118,7 @@ def __str__(self): # Ubuntu: py3.7,clang-6.0 matrix.add_build( - name="bionic - clang-6.0", + name="jammy - clang-6.0", env=dict( CC="clang-6.0", CXX="clang++-6.0", @@ -129,7 +129,7 @@ def __str__(self): # Ubuntu: TEST_INSTALL matrix.add_build( - name="bionic - test-install", + name="jammy - test-install", env=dict(TEST_INSTALL="t"), docker_tag=True, )