Jenkinsfile: enable DockerPluginSuite (integration-cli)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
moby · Aug 24, 2023 · 2d657cd · 2d657cd
1 parent 64f5d9b
commit 2d657cd
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -409,7 +409,7 @@ jobs:
           # also overrides being added to the matrix like "./..." to run
           # "Test integration" step exclusively and specific tests suites that
           # take a long time to run.
-          matrix="$(gotestlist -d ${{ env.ITG_CLI_MATRIX_SIZE }} -o "./..." -o "DockerSwarmSuite" -o "DockerNetworkSuite|DockerExternalVolumeSuite" ./...)"
+          matrix="$(gotestlist -d ${{ env.ITG_CLI_MATRIX_SIZE }} -o "./..." -o "DockerSwarmSuite" -o "DockerNetworkSuite|DockerExternalVolumeSuite|DockerPluginSuite" ./...)"
           echo "matrix=$matrix" >> $GITHUB_OUTPUT
       -
         name: Show matrix

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -55,9 +55,6 @@ pipeline {
                         expression { params.arm64 }
                     }
                     agent { label 'arm64 && ubuntu-2004' }
-                    environment {
-                        TEST_SKIP_INTEGRATION_CLI = '1'
-                    }
 
                     stages {
                         stage("Print info") {
@@ -101,7 +98,6 @@ pipeline {
                             }
                         }
                         stage("Integration tests") {
-                            environment { TEST_SKIP_INTEGRATION_CLI = '1' }
                             steps {
                                 sh '''
                                 docker run --rm -t --privileged \
@@ -112,7 +108,6 @@ pipeline {
                                   -e DOCKER_GRAPHDRIVER \
                                   -e TESTDEBUG \
                                   -e TEST_INTEGRATION_USE_SNAPSHOTTER \
-                                  -e TEST_SKIP_INTEGRATION_CLI \
                                   -e TIMEOUT \
                                   -e VALIDATE_REPO=${GIT_URL} \
                                   -e VALIDATE_BRANCH=${CHANGE_TARGET} \