Skip to content

Commit

Permalink
docker: transition bionic to jammy
Browse files Browse the repository at this point in the history
  • Loading branch information
trws committed Aug 4, 2023
1 parent d8c5420 commit e963915
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions src/test/docker-deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion src/test/docker/docker-run-checks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
8 changes: 4 additions & 4 deletions src/test/generate-matrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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,
)
Expand Down

0 comments on commit e963915

Please sign in to comment.