From 95d9af6039f936b2e02757dca3903ee9e6496325 Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@redhat.com>
Date: Mon, 26 Jan 2026 17:14:20 -0500
Subject: [PATCH] Set DOCKER_API_VERSION=1.44 for conformance tests

The default requested API version from go-dockerclient is considered too
old by dockerd, so set it for CI and in how we suggest people run them
locally.

Switch from jammy (22.04) to noble (24.04) as the test environment.

Bump the version of Go we use to 1.23, as 1.22 is no longer supported.
1.23 isn't either, but we're waiting on being able to run the unit tests
with 1.24, too.

Stop attempting to notify an IRC channel that the repo maintainers
aren't watching.

Test with the version of dockerd included in noble instead of installing
something from upstream.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
---
 .travis.yml | 15 +++------------
 README.md   |  2 +-
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6d65aa2c..191fc624 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,21 +6,15 @@ arch:
   - amd64
   - arm64
 
-dist: jammy
+dist: noble
 
 services:
   - docker
 
 go:
-  - "1.22.12"
+  - "1.23.12"
 
 before_install:
-  - sudo systemctl stop docker.service && sudo systemctl stop docker.socket
-  - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-  - yes | sudo add-apt-repository "deb [arch=${TRAVIS_CPU_ARCH}] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
-  - sudo apt-get update -q -y
-  - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
-  - sudo systemctl enable --now docker.service && sudo systemctl enable --now docker.socket
   - docker pull mirror.gcr.io/alpine
   - docker pull mirror.gcr.io/busybox
   - docker pull public.ecr.aws/docker/library/centos:7
@@ -34,7 +28,4 @@ before_install:
 script:
   - make build
   - make test
-  - travis_wait 45 make test-conformance
-
-notifications:
-  irc: "chat.freenode.net#openshift-dev"
+  - travis_wait 45 make test-conformance DOCKER_API_VERSION=1.44
diff --git a/README.md b/README.md
index e83449b2..78260235 100644
--- a/README.md
+++ b/README.md
@@ -112,5 +112,5 @@ docker rmi registry.fedoraproject.org/fedora-minimal:42-aarch64; docker pull reg
 docker rmi mirror.gcr.io/golang:1.24; docker pull mirror.gcr.io/golang:1.24
 docker rmi mirror.gcr.io/nginx; docker pull mirror.gcr.io/nginx
 chmod -R go-w ./dockerclient/testdata
-go test ./dockerclient -tags conformance -timeout 30m
+env DOCKER_API_VERSION=1.44 go test ./dockerclient -tags conformance -timeout 30m
 ```