Commit Graph

84 Commits

Author SHA1 Message Date
Gerald Combs 69977f3109 GitLab CI: Add initial Windows package builds.
Manually copy over the Win64 Package and Win32 Package jobs from
2d9280089c in master and adapt for the 3.4 release builds.
2021-06-19 17:21:07 -07:00
Gerald Combs 17a3789ad8 GitLab CI: Move dfilter list generation.
Create the display filter list in the APT Test step.
2021-06-02 13:05:21 -07:00
Gerald Combs 6da1114152 GitLab CI: Enable ccache for fuzz builds.
Enable ccache for our fuzz builds. Add sections as described at
https://docs.gitlab.com/ee/ci/jobs/#expand-and-collapse-job-log-sections
for the CMake step as well.


(cherry picked from commit 02f4dcb0ad)
2021-05-25 18:43:34 +00:00
Gerald Combs 28aecbba66 GitLab CI: Set our Clang version. 2021-05-08 09:30:33 -07:00
Gerald Combs 728ae2de5f GitLab CI: Fix our fuzzing resource group. 2021-05-07 17:09:42 -07:00
Gerald Combs 2410d8b6eb GitLab CI: Add fuzzing to the 3.4 branch.
Backport part of d7bdd77a4c, which adds a -t option to
tools/fuzz-test.sh which lets you specify a maximum fuzz time.

Copy over the current (as of 7c6df3848f) fuzz jobs from the master
branch.
2021-05-07 14:09:10 -07:00
Gerald Combs 66cba93e39 GitLab CI: Give our jobs proper names.
GitLab's job YAML parser allows spaces in key names and our jobs are
visible in the web UI, so give them proper names.
2021-05-07 20:11:37 +00:00
Gerald Combs c1cf92283c GitLab CI: Restore the ability to run pipelines from the web UI.
(cherry picked from commit bedf0eb21c)
2021-05-07 19:26:51 +00:00
Gerald Combs 219978c50d GitLab CI: Miscellaneous updates.
Copy over various updates from the master branch including:

- Setting a git clone depth.
- Running manually in forks.
- Rule reuse.
- Using "extends" instead of YAML anchors.
2021-05-04 15:56:16 -07:00
Gerald Combs 1be17e2d30 GitLab CI: Switch to our new Windows runner.
(cherry picked from commit 85b36ef4b6)
2021-04-04 22:53:46 +00:00
Gerald Combs e8421b1a0e GitLab CI: Add a `tshark -G` artifact.
Dump `tshark -G fields` to a file and add it as an artifact. This
automates a step in the release process.
2021-03-10 23:56:12 +00:00
Dario Lombardo c3b3e09f94 gitlab-ci: fix build:ubuntu-dist.
(cherry picked from commit 33ab986589)
2020-12-22 18:04:59 +00:00
Gerald Combs bab5339f3a GitLab CI: Copy over the build:ubuntu-dist job from master. 2020-12-21 16:05:27 -08:00
Gerald Combs 19cf6c5600 GitLab CI: Use our images. 2020-12-09 19:11:23 -08:00
Gerald Combs 273eb0efcc GitLab CI: Remove more external dependencies. 2020-12-10 02:42:10 +00:00
Gerald Combs 1bf7c9a693 CI: Fix Ubuntu tests.
The wireshark/wireshark-ubuntu-dev image was recently upgraded to Ubuntu
20.04. Since then the following tests have been failing:

---- FAILED
test/suite_capture.py::case_wireshark_capture::test_wireshark_capture_from_fifo
FAILED
test/suite_capture.py::case_wireshark_capture::test_wireshark_capture_from_stdin
FAILED
test/suite_capture.py::case_tshark_capture::test_tshark_capture_from_fifo
FAILED
test/suite_capture.py::case_tshark_capture::test_tshark_capture_from_stdin
FAILED
test/suite_capture.py::case_dumpcap_capture::test_dumpcap_capture_from_fifo
FAILED
test/suite_capture.py::case_dumpcap_capture::test_dumpcap_capture_from_stdin
FAILED
test/suite_capture.py::case_dumpcap_autostop::test_dumpcap_autostop_filesize
FAILED
test/suite_capture.py::case_dumpcap_autostop::test_dumpcap_autostop_packets
FAILED
test/suite_capture.py::case_dumpcap_ringbuffer::test_dumpcap_ringbuffer_filesize
FAILED
test/suite_capture.py::case_dumpcap_ringbuffer::test_dumpcap_ringbuffer_packets
FAILED
test/suite_capture.py::case_dumpcap_pcapng_sections::test_dumpcap_pcapng_multi_in_multi_out
FAILED
test/suite_capture.py::case_dumpcap_pcapng_sections::test_dumpcap_pcapng_multi_in_single_out
FAILED
test/suite_capture.py::case_dumpcap_pcapng_sections::test_dumpcap_pcapng_single_in_multi_out
FAILED
test/suite_capture.py::case_dumpcap_pcapng_sections::test_dumpcap_pcapng_single_in_single_out
FAILED
test/suite_clopts.py::case_dumpcap_options::test_dumpcap_interface_chars
FAILED
test/suite_clopts.py::case_dumpcap_options::test_dumpcap_invalid_chars
FAILED
test/suite_clopts.py::case_dumpcap_options::test_dumpcap_valid_chars
----

This is because dumpcap can't load our local libraries after setting cap_net_raw+cap_net_admin:

----
-- Begin stderr for command ('/builds/wireshark/wireshark/build/run/dumpcap', '-D') --
/builds/wireshark/wireshark/build/run/dumpcap: error while loading shared libraries: libwsutil.so.0: cannot open shared object file: No such file or directory
-- End stderr for command ('/builds/wireshark/wireshark/build/run/dumpcap', '-D') --
----

Add $(pwd)/run to our rpath.


(cherry picked from commit ef10cc74d1)
2020-12-10 02:20:08 +00:00
Gerald Combs 01fb136ec9 GitLab CI: Stop installing external dependencies.
Remove the last package installation instances from .gitlab-ci.yml. Add
a comment at the top noting that dependencies should be added to our
Dockerfiles instead.
2020-12-09 13:25:10 -08:00
Gerald Combs 3501e40941 GitLab CI: Update lintian excludes.
Add "copyright-excludes-files-in-native-package" to the lintian exclude
list. The wireshark/wireshark-ubuntu-dev image was updated to 20.04
recently, and its lintian added
https://lintian.org/tags/copyright-excludes-files-in-native-package.html.


(cherry picked from commit 7a8a3a8702)
2020-12-08 21:26:54 +00:00
Gerald Combs de66fa058f CI+RPM: Disable the Fedora build for now.
Fedora 33's RPM environent added changes that break CMake. Disable it
for now.


(cherry picked from commit 05bd5cd91e)
2020-11-05 17:36:07 +00:00
Gerald Combs eff9f0fb0d Initialize release-3.4.
Initialize the release-3.4 branch.
2020-10-22 11:38:47 -07:00
Moshe Kaplan 3dde70de2c .gitlab-ci: Generate cppcheck reports
Modify the cppcheck job to also generate cppcheck's reports
and provide them as artifacts to the user.
2020-10-15 19:39:11 +00:00
Moshe Kaplan a9f6bfff62 gitlab-ci: Add docbook job for WSUG and WSDG
Adds job of building the HTML versions of the
Wireshark User Guide and Wireshark Developer Guide.
PDF versions are not built because it would take significantly longer
(~10 mins instead of ~5 minutes)
2020-10-13 18:58:48 +00:00
Gerald Combs d3c1f31439 Windows: Switch to Qt 5.15.1.
Switch the Windows GitLab runner and Buildbot builders to Qt 5.15.1. Qt
5.15 includes HiDPI and dark mode improvements that we might find
useful.
2020-09-22 16:35:55 -07:00
Gerald Combs ece76abdd3 GitLab CI: Move commit validation to its own job.
Move the pre-commit and validate-commit checks to their own job. This
lets us quickly re-run validate-commit in case the submitter forgets to
check "Allow commits from members who can merge to the target branch"

Shorten the "merge-request" prefix to "merge-req" in order to make it
easier to distinguish between each job in the GitLab UI.
2020-09-16 01:04:34 +00:00
Gerald Combs 9e2cbb995e GitLab CI: Set MAKEFLAGS=--silent
Set MAKEFLAGS=--silent in order to reduce the size of our log output.
2020-09-09 13:20:46 -07:00
Gerald Combs 322f6f3988 GitLab CI: Restrict the Windows build to wireshark/wireshark.
The Windows runners are constrained by the following:

* We require quite a bit of software not present in the stanadard
runner[1] which takes a long time to install, including Python, Perl,
and Qt.

* You can't specify an arbitrary Docker image like you can with Linux
runners.

As a result we have a project-specific runner for wireshark/wireshark
that runs a custom Windows Docker image. Update the CI rules so that
merge-request:windows only runs for gitlab.com/wireshark/wireshark. The
GitLab documentation recommends rules over only/except, so switch to
them.

Fixup .editorconfig while we're here.

[1]https://gitlab.com/gitlab-org/ci-cd/shared-runners/images/gcp/windows-containers/blob/master/cookbooks/preinstalled-software/README.md
2020-09-07 19:35:45 +00:00
Gerald Combs 0e6027313d gitlab-ci: Enable the Windows MR build.
Git is currently broken in gitlab-runner 13.3.0 + Windows + Docker...

https://gitlab.com/gitlab-org/gitlab/-/issues/239013

...but it appears to work fine in gitlab-runner 13.2.0. I reverted the build machine to that version, so we can enable the merge-request:windows build.
2020-09-02 13:23:24 -07:00
Gerald Combs 5aec54c9c3 GitLab CI: Set up ccache.
Set up a per-job cache directory and enable ccache as described at

https://gould.cx/ted/blog/2017/06/10/ccache-for-Gitlab-CI/

and

https://docs.gitlab.com/ee/ci/yaml/README.html#cache

Enable ccache in the merge-request steps.

Export DEB_BUILD_OPTIONS=nocheck while we're here.
2020-09-02 17:37:44 +00:00
Gerald Combs 3e0ebabdec CI+tools: Install lintian.
Install lintian instead of devscripts (which pulls in lintian + many
other packages) in .gitlab-ci.yml. Add lintian to DEBDEPS_LIST in
debian-setup.sh.
2020-09-01 08:46:08 +00:00
Dario Lombardo feba9bbff4 ci: add clang-tools to merge-request:ubuntu-clang-other-tests job.
It's required by validate-clang-check.
2020-08-24 13:15:30 +00:00
Dario Lombardo b586f25789
tools: rename validate-clang-check.py to validate-clang-check.sh.
This reflects the actual language used in the code (sh).
2020-08-24 14:26:23 +02:00
Gerald Combs 50550708cc Add merge request jobs to GitLab CI and migrate commit validation.
Copy the Buildbot petri dish builder steps to corresponding GitLab CI
jobs. Update validate-commit.py to look for old "Bug:" and "Ping-Bug:"
references and have it call `git stripspace` directly. tools/commit-msg
was specific to Gerrit, so remove it.

Change-Id: Icbc54709052f44c941db9ad6a5dcf596292782a2
2020-08-23 17:46:18 -07:00
Dario Lombardo f363aa57f9 gitlab-ci: add test:debian-stable.
This is going to install the deb artifact created before.

Change-Id: I59a52c8d7fe5dd46bb3ed8684ab3dd477f3baea4
Reviewed-on: https://code.wireshark.org/review/37366
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2020-06-04 07:23:27 +00:00
Dario Lombardo 77b0dc6931 gitlab/travis: remove nopcap tests.
Lack of capture support is such a rare case, it is not worth spending
too much CI cycles testing it for every build.

Change-Id: Ia9be2b6ba21d0b198e65d746483282ef66cadb84
Reviewed-on: https://code.wireshark.org/review/36626
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2020-03-29 20:36:32 +00:00
Peter Wu 7579d98448 gitlab-ci: upgrade to Clang 10, drop special -Wframe-larger-than case
Requires an updated wireshark/wireshark-ubuntu-dev image:
https://github.com/wireshark/wireshark-ubuntu-dev-docker/pull/2

Remove -Wframe-larger-than while at it. The default size in our CMake
config is 32k. Clang should not significantly go over it. If so, then it
has to be solved there, and not in the Gitlab config.

Change-Id: I3891fcbd9dec8e5a4597404aa8131f28a1755a02
Reviewed-on: https://code.wireshark.org/review/36369
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2020-03-25 14:41:13 +00:00
Peter Wu 7e89bd873a gitlab-ci: test nopcap build with gcc-7 instead of gcc-8
gcc-7 is included with build-essential on Ubuntu 18.04, not installing
an additional gcc-8 saves 110M on disk. The coverage should more or less
be the same, even very old compilers will catch typical build failures.

Change-Id: I03c95dcd1c83b02390489a47de7e2a8d2d757232
Reviewed-on: https://code.wireshark.org/review/36415
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2020-03-14 16:56:30 +00:00
Peter Wu 9dcba0c68a gitlab-ci: print tshark --version for OpenSUSE and Debian
Add missing output directory for Debian (obj-x86_64-linux-gnu). Restore
a working LD_LIBRARY_PATH setting for OpenSUSE, this has never worked
since v3.1.0rc0-590-gc77ee0008d.

Change-Id: I4f2c2e4636e7dd0233e7f08a88ba3789b021f274
Reviewed-on: https://code.wireshark.org/review/36378
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2020-03-13 22:05:13 +00:00
Peter Wu 0ec5ca3ecf gitlab-ci: remove GCC-5
As previously in commit 6bb691189c ("gitlab-ci: remove unnecessary jobs,
upgrade versions"), GCC 5 support would only catch two issues. From the
respective commits:

    epan/dissectors/packet-synphasor.c:782:7: error: ‘ai’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
    ui/qt/wireless_frame.h:63:25: error: in-class initialization of non-static data member is a C++11 extension [-Werror,-Wc++11-extensions]

These are normally just false positive warnings in old compilers, fixed
in newer GCC. It fails only because it was built from git master as
opposed to a release branch where -Werror is disabled by default.

Save some resources, and remove GCC 5. The CentOS-7 job still tests the
old GCC 4.8.5 compiler. Newer GCC versions are handled by other jobs.

Change-Id: I9f49d59e6476ea8bcd9e135dba1c94b37a2f047f
Reviewed-on: https://code.wireshark.org/review/36366
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2020-03-11 22:16:49 +00:00
Anders Broman 6e9e51e49c Revert "gitlab-ci: upgrade to Clang 10"
This reverts commit fbe9d7f4b4.

Change-Id: If7a3ae53c434bf5fe90a41ea56a1e8be958b1f55
Reviewed-on: https://code.wireshark.org/review/36286
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-03-05 08:18:08 +00:00
Peter Wu fbe9d7f4b4 gitlab-ci: upgrade to Clang 10
Requires an updated wireshark/wireshark-ubuntu-dev image:
https://github.com/wireshark/wireshark-ubuntu-dev-docker/pull/2

Change-Id: Iee869a44cede6152a2f7927735a74b0bb89bef60
Reviewed-on: https://code.wireshark.org/review/36283
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-03-05 04:46:15 +00:00
Peter Wu 6bb691189c gitlab-ci: remove unnecessary jobs, upgrade versions
The point of testing multiple compiler versions is to catch bugs that
only occur in one particular version. After an analysis of 800+ failed
builds, it appears that a lot of the checks are redundant. Changes:

* Drop GCC 6 and keep GCC 5, Ubuntu 16.04 default GCC is 5.3. Fixes for
  warnings in old compilers: commit 829d2c3752 (GCC 5 + 6), commit
  e451ea0a4d (Clang 5, GCC 4 + 5). Maybe GCC 5 can also be dropped since
  Ubuntu 18.04 is around for a while.
* Drop clang-nopcap, all errors caught by Clang were also caught by GCC.
  One change caught by gcc-8-nopcap but not Clang: commit 036c3d6bc7.
* Remove Clang 5: even though it triggers some unique failures, no major
  distro ships with it so remove it.
* Drop old Clang versions, newer versions catch all warnings from older.
* Upgrade to Clang 8 which is already installed in the Docker image.
* Remove EOL Fedora 28 and 29, use latest (31).
* Remove EOL openSUSE Leap 42.3, keep 15.1 as the latest.

Reduces from 20 jobs (15 build, 5 test) to 10 jobs (7 build, 3 test).

Change-Id: I4a355dd1a90cbbef9525bd63a8544fa3e22369a2
Reviewed-on: https://code.wireshark.org/review/36281
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-03-05 04:45:52 +00:00
Dario Lombardo dd9af8018d gitlab-ci: fix wrong job name.
Change-Id: Ia14af8922e5e717d931480225fd0202b697f9155
Reviewed-on: https://code.wireshark.org/review/35003
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-11-06 13:58:28 +00:00
Dario Lombardo 8cfe3f5aeb gitlab-ci: bump opensuse image version to 15.1.
According to https://en.wikipedia.org/wiki/OpenSUSE_version_history#Leap_15_series_[22][23]
15.0 is EOL in November 2019.

Change-Id: I201fc2683078f7ae16b9317e3b34c312f442aeb1
Reviewed-on: https://code.wireshark.org/review/34944
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-11-04 13:41:29 +00:00
Juergen Kosel b1e74c527b gitlab-ci: Add job to create debian install-packages
Inspired by the description in https://about.gitlab.com/2016/10/12/automated-debian-package-build-with-gitlab-ci/
the gitlab-ci job build-debian-deb generates *.deb files
These files are available as build artifacts for 3 days.

Change-Id: Ic0b01c161e659c3ed9dbbd6387fa8960e34d50d3
Signed-off-by: Juergen Kosel <juergen.kosel@gmx.de>
Reviewed-on: https://code.wireshark.org/review/34042
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-08-03 20:23:12 +00:00
Dario Lombardo 8ba4af7c1f gitlab-ci: use opensuse/leap:42.3 image.
The former official image has been deprecated in favor of
opensuse/leap one.

Change-Id: I92de89060f2d8f3a679f0c332eebb65e5c13ba41
Reviewed-on: https://code.wireshark.org/review/33852
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2019-07-06 18:20:31 +00:00
Dario Lombardo bb00f37f51 gitlab-ci: run setcap on dumpcap.
This enables capture privileges for 'user' that is used in the tests.
travis.yml has been changed as well to reflect the setcap command in
the docs.

Change-Id: I0584e0df417112b1774b86ef8b28121799efe137
Reviewed-on: https://code.wireshark.org/review/33182
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-05-16 20:29:59 +00:00
Dario Lombardo 731b263853 gitlab-ci: move ubuntu commands in parent job.
Change-Id: Ieb7a05c74b728d3d293790d28812c9161bfa6ce3
Reviewed-on: https://code.wireshark.org/review/33181
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-05-16 20:29:33 +00:00
Dario Lombardo c95e83d9a9 gitlab-ci: fix pytest execution.
pytest-3 is the executable name on the docker image (ubuntu derivated).

Remove pip and pytest installation while here, since they're
provided by the docker image.

Change-Id: Iad2e9cafc42cd1e83b2868126abb91d5ee7bbd92
Reviewed-on: https://code.wireshark.org/review/33145
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-05-11 13:05:54 +00:00
Dario Lombardo ab7ee924a1 gitlab-ci: use new base image, drop gcc-4 job
Docker image: https://hub.docker.com/r/wireshark/wireshark-ubuntu-dev
Github repo: https://github.com/wireshark/wireshark-ubuntu-dev-docker

Drop GCC 4.9 since it is missing on the new Ubuntu 18.04 image. Rely on
CentOS 7 for testing GCC 4.8.5 in case that is important.

Change-Id: I02a2b22a5920e6a65aee2b2eb60c81df03742417
Reviewed-on: https://code.wireshark.org/review/31872
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-05-09 22:16:44 +00:00
Dániel Bakai c77ee0008d rpm: update rpm package dependencies and spec to work on current os versions
Change-Id: Iaa0bd9513869e65b96b6014d66ca3cfd917dbe64
Reviewed-on: https://code.wireshark.org/review/32938
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-04-22 13:21:37 +00:00