Commit graph

140 commits

Author SHA1 Message Date
CrazyMax
f7e59cbccc
Jenkinsfile: Fix dev image build fox ppc64le/s390x archs
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-11-29 11:59:09 +01:00
CrazyMax
bade242ddd
Makefile: always use buildx
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-11-25 23:22:53 +01:00
Sebastiaan van Stijn
7ff0f654fb
daemon: add TEST_INTEGRATION_USE_SNAPSHOTTER for CI
This allows us to run CI with the containerd snapshotter enabled, without
patching the daemon.json, or changing how tests set up daemon flags.

A warning log is added during startup, to inform if this variable is set,
as it should only be used for our integration tests.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-10-17 15:13:53 +02:00
Sebastiaan van Stijn
419c47a80a
Jenkinsfile: use Ubuntu 20.04 for DCO stage
Also switching to use arm64, as all amd64 stages have moved to GitHub actions,
so using arm64 allows the same machine to be used for tests after the DCO check
completed.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-09-21 17:28:04 +02:00
CrazyMax
8596486743
Jenkinsfile: remove unit-validate stage
Left cross step is already in GHA so we can remove
unit-validate stage.

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-09-16 19:46:56 +02:00
CrazyMax
cd54f31984
Jenkinsfile: remove report bundles creation in unit-validate
This was missing to be removed from Jenkinsfile when we moved
to GHA for unit and integration tests.

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-09-16 19:46:56 +02:00
CrazyMax
a354970eaa
Jenkinsfile: remove validation steps moved to GHA
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-09-16 19:46:56 +02:00
CrazyMax
9f8bd80487
Jenkinsfile: remove steps moved to GitHub Actions
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-09-08 16:41:43 +02:00
CrazyMax
807c849431
ci(test): send coverage to codecov
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-09-08 12:12:03 +02:00
Sebastiaan van Stijn
e3c14acd33
Jenkinsfile: remove Windows stages
These are now running in GitHub actions, so we no longer need to
run them in Jenkins.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-05-31 22:14:15 +02:00
Sebastiaan van Stijn
efe03aa2d8
Jenkinsfile: add workaround for CVE-2022-24765
git published an advisory Yesterday, which (as a counter-measure)
requires the git repository's directory to be owned by the current
user, and otherwise produce an error:

    fatal: unsafe repository ('/workspace' is owned by someone else)
    To add an exception for this directory, call:

        git config --global --add safe.directory /workspace

The DCO check is run within a container, which is running as `root`
(to allow packages to be installed), but because of this, the user
does not match the files that are bind-mounted from the host (as they
are checked out by Jenkins, using a different user).

To work around this issue, this patch configures git to consider the
`/workspace` directory as "safe". We configure it in the `--system`
configuration so that it takes effect for "all users" inside the
container.

More details on the advisory can be found on GitHub's blog:
https://github.blog/2022-04-12-git-security-vulnerability-announced/

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-04-13 15:58:55 +02:00
Sebastiaan van Stijn
87948c7892
Jenkinsfile: allow all ppc64le / s390x stages through checkbox
Previously, the ppc64ls and s390x stages only ran on non-PR commits,
but the unit-tests and integration/xx tests could be enabled with
a checkbox.

This patch changes the Jenkinsfile to also allow the integration-cli
tests to be run on pull requests if the checkbox is enabled.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-04-06 15:40:47 +02:00
Sebastiaan van Stijn
9326ea5b99
Jenkinsfile: remove Windows RS1 as it reached end of support
It was already disabled by default, but removing it now that it reached
end of the line.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-01-12 01:05:17 +01:00
Sebastiaan van Stijn
080529dfea
Jenkinsfile: update check-config script to latest version
Diff:

    git diff 2b0755b936416834e14208c6c37b36977e67ea35...33a3680e08d1007e72c3b3f1454f823d8e9948ee -- contrib/check-config.sh

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-11-10 17:11:48 +01:00
Sebastiaan van Stijn
ae0795a99c
Merge pull request #42765 from thaJeztah/windows_2022_ltsc
Jenkinsfile: windows 2022 LTSC mcr.microsoft.com/windows/servercore:ltsc2022
2021-08-27 15:52:58 +02:00
Sebastiaan van Stijn
d7abbd01eb
Jenkinsfile: windows 2022 LTSC mcr.microsoft.com/windows/servercore:ltsc2022
see https://docs.microsoft.com/en-us/windows-server/get-started/windows-server-release-info

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-20 14:48:08 +02:00
Olli Janatuinen
1285c6d125 Windows CI: Add support for testing with containerd
Signed-off-by: Olli Janatuinen <olli.janatuinen@gmail.com>
2021-08-17 07:09:40 -07:00
Sebastiaan van Stijn
4706e1c37d
Jenkinsfile: update Windows 2022 insider to latest tag (10.0.20348.1)
Tags can be found at https://mcr.microsoft.com/v2/windows/servercore/insider/tags/list

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-09 17:57:42 +02:00
Roman Volosatovs
3af2217dc4
hack/test/unit: run libnetwork tests sequentially
Run all tests within `libnetwork` namespace with `-p=1`
in a separate `gotestsum` invocation.

Signed-off-by: Roman Volosatovs <roman.volosatovs@docker.com>
2021-08-03 12:19:49 +02:00
Stefan Scherer
7a6cac2b23
Run s390x tests on Ubuntu 20.04
Signed-off-by: Stefan Scherer <stefan.scherer@docker.com>
2021-06-29 17:33:40 +02:00
Sebastiaan van Stijn
9973dc67dd
Jenkinsfile: add stage for Windows 2022 on containerd
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-24 10:24:59 +02:00
Frédéric Dalleau
72549d4ca1 Fix cross compilation in Jenkinsfile
Signed-off-by: Frédéric Dalleau <frederic.dalleau@docker.com>
2021-06-22 12:05:51 +02:00
Brian Goff
9184f7fdff Ensure ip6table_filter module on all ci nodes for libnetwork
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2021-06-01 22:54:09 +00:00
Brian Goff
72c4a7b496 Fix issues running libnetwork tests.
libnetwork does different stuff depending on if you are running the
tests in a container or not... without telling it we are in a container
a bunch of the tests actually fail.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2021-06-01 22:14:41 +00:00
Brian Goff
4da0dc974c Ensure docker-proxy is installed in unit-test ci
(some) libnetwork tests require docker-proxy so we need to install that
in CI.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2021-06-01 22:14:31 +00:00
Brian Goff
86c8b8f1a0 Move proxy build into hack/make
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2021-06-01 22:14:06 +00:00
Sebastiaan van Stijn
82c7e906ea
Jenkinsfile: skip ppc64le and s390x by default on pull requests
This changes CI to skip these platforms by default. The ppc64le and s390x
machines are "pet machines", configuration may be outdated, and these
machines are known to be flaky.

Building and verifying packages for these platforms is being handed
over to the IBM team.

We can still run these platforms for specific pull requests by selecting
the checkboxes.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-05-12 12:38:41 +02:00
Sebastiaan van Stijn
b5f0096584
Jenkinsfile: temporarily use insider build for Windows 2022 (SAC)
Images for Windows 2022 (SAC) are not yet available, so using insider builds
in the meantime; mcr.microsoft.com/windows/servercore/insider:10.0.20295.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-04-08 21:25:35 +02:00
Sebastiaan van Stijn
e13d41db1b
Jenkinsfile: update to Windows 2022
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-04-08 21:25:30 +02:00
Sebastiaan van Stijn
0100a9ebc1
Jenkinsfile: windows-1903: send junit.xml results
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-04-08 21:24:08 +02:00
Sebastiaan van Stijn
fa194ec86c
Jenkinsfile: add stage for Windows 1903 (SAC)
This adds a stage to test against the current SAC (Semi Annual Channel),
which allows us to catch possible regressions on upcoming LTS versions.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-04-08 21:22:20 +02:00
Sebastiaan van Stijn
bedefacfd5
Jenkinsfile: update check-config.sh to latest version
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-04-02 20:45:03 +02:00
Stefan Scherer
b7c3548c82
Pin arm64 machines to a specific Ubuntu version
Signed-off-by: Stefan Scherer <stefan.scherer@docker.com>
2021-03-30 17:03:32 +02:00
Akihiro Suda
c23b99f4db
Jenkinsfile: add cgroup2
Thanks to Stefan Scherer for setting up the Jenkins nodes.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2021-02-01 14:48:34 +09:00
Sebastiaan van Stijn
b4b902b88f
Jenkinsfile: remove e2e image stage
The image that's built is not pushed anywhere, and is just
building the same as the main image already builds, so didn't
add value.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-11-10 18:42:13 +01:00
Olli Janatuinen
82b5ff8026 Windows CI: Make sure that CI fails on any error
- If unit tests fails
- If intergration tests fails

Signed-off-by: Olli Janatuinen <olli.janatuinen@gmail.com>
2020-09-17 08:59:49 +03:00
Tibor Vass
b280ea114f hack: add more debugging to understand exit codepath
Signed-off-by: Tibor Vass <tibor@docker.com>
2020-05-27 23:40:11 +00:00
Akihiro Suda
d1304a8c74 Jenkinsfile: remove redundant DOCKER_EXPERIMENTAL
DOCKER_EXPERIMENTAL is already set in the head of the file.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-04-07 00:59:15 +09:00
Stefan Scherer
c239bbbcb2
Switch to s390x Ubuntu 18.04
Signed-off-by: Stefan Scherer <stefan.scherer@docker.com>
2020-03-11 20:05:23 +01:00
Akihiro Suda
5bf33adba2 hack: support $DOCKER_ROOTLESS for testing rootless
```
$ DOCKER_EXPERIMENTAL=1 DOCKER_ROOTLESS=1 TEST_SKIP_INTEGRATION_CLI=1 \
 make test-integration
```

test-integration-cli is unsupported currently.
Also, tests that spawn custom daemon (testutil/daemon) are skipped.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-03-10 05:49:45 +09:00
Sebastiaan van Stijn
8a52139a0f
Revert "Jenkinsfile: temporarily pin windows image to 10.0.17763.973"
This reverts commit fa2417984b.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-13 11:42:56 +01:00
Sebastiaan van Stijn
fa2417984b
Jenkinsfile: temporarily pin windows image to 10.0.17763.973
The latest `ltsc2019` image (`10.0.17763.1039`) appear to be broken,
and even a `RUN Write-Host hello` hangs.

Temporarily switching back to an older version so that CI doesn't fail.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-12 14:41:34 +01:00
Sebastiaan van Stijn
bbcabf69c8
Merge pull request #40050 from thaJeztah/ci_force_validate
Jenkinsfile: force validate on master, and some fixes/improvements
2019-12-23 13:39:43 +01:00
Vikram bir Singh
8d2e1ee546
Build and use gotestsum for running all tests
1. Dockerfile.Windows modified to build gotestsum.exe

2. Use gotestsum.exe in invoking the execution of:

   (a) Unit tests (run in containers),
   (b) Integration tests (run outside containers)
   (c) Integration-cli (run outside containers)

No changes made to other categories of tests (e.g.
LCOW).

3. Copy .xml files produced by gotestsum in
   appropriate paths where Jenkins can ingest them

4. Modify Jenkinsfile to mark results output as
   being jUnit "type" as well as to archive the
   .xml test result files as artifacts.

Signed-off-by: Vikram bir Singh <vikrambir.singh@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-12-19 20:31:22 +01:00
Sebastiaan van Stijn
cd094422a7
Jenkinsfile: force validate steps on master and backports
On master ("non-pull-request"), force running some validation checks
(such as vendor, swagger), even if no files were changed. This allows
catching problems caused by pull-requests that were merged out-of-sequence.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-12-19 18:05:18 +01:00
Sam Whited
d6a91ca71c Rename DCO check param in Jenkinsfile
Previously it was a negative parameter for skiping the DCO check, but
this is different from other checks. It was requested that I change this
in #40023 but I'm factoring it out as an unrelated change.

Signed-off-by: Sam Whited <sam@samwhited.com>
2019-10-31 11:56:35 -04:00
Sebastiaan van Stijn
684d0ba98a
Merge pull request #40089 from thaJeztah/fix_buildx_target
Fix various issues with the "make buildx" target
2019-10-22 02:07:05 +02:00
Sebastiaan van Stijn
c110283004
Jenkinsfile: use buildx on s390x and ppc64le
Commit 1be2cc2568 updated the
Makefile to force the use of BuildKit, if `USE_BUILDX` was
not set.

As a side-effect, Jenkins now started using BuildKit on
s390x and ppc64le as well, because it overwrote the
`DOCKER_BUILDKIT=0` that was set.

This commit forces the use of buildx on s390x and ppc64le.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-22 00:01:52 +02:00
Sebastiaan van Stijn
7c5fd83c22
Jenkinsfile: set repo and branch for DCO check as well
Commit 7019b60d0d added these
env-vars to other stages, but forgot to update the DCO stage,
which also does a diff to validate commits that are in a PR.

Also adding openssh-client, for situations where the upstream
needs to be accessed through an ssh connection.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-21 23:30:38 +02:00
Sebastiaan van Stijn
eda98ad00f
Jenkinsfile: aarch64: use new labels to select agents
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-08 18:47:59 +02:00