Skip to content
This repository has been archived by the owner on May 21, 2024. It is now read-only.

Remove Jenkins pipeline and a few references #1236

Merged
merged 2 commits into from
Jun 19, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
198 changes: 0 additions & 198 deletions Jenkinsfile

This file was deleted.

4 changes: 2 additions & 2 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ Some tests require additional setups, such as code coverage, HSM emulation or pr

Note that it will run CMake itself in a dedicated build directory.

To get a list of the common environment variables and their corresponding system requirements, have a look at the link:Jenkinsfile[Jenkins Pipelines definitions] and the project's link:docker/[Dockerfiles].
To get a list of the common environment variables and their corresponding system requirements, have a look at the link:ci/gitlab/.gitlab-ci.yml[Gitlab CI configuration] and the project's link:docker/[Dockerfiles].


=== Tags
Expand Down Expand Up @@ -189,7 +189,7 @@ Inside the container, the test suite with coverage can be run with:
TEST_WITH_COVERAGE=1 TEST_WITH_P11=1 TEST_WITH_STATICTESTS=1 ./scripts/test.sh
----

(see the content of link:Jenkinsfile[] and link:scripts/test.sh[] for more testing options)
(see the content of link:ci/gitlab/.gitlab-ci.yml[] and link:scripts/test.sh[] for more testing options)

Alternatively, link:scripts/run_docker_test.sh[] can directly run the test script:

Expand Down
5 changes: 4 additions & 1 deletion scripts/run_docker_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -euo pipefail

# Utility to help running in-docker tests in the same conditions as CI (Jenkins)
# Utility to help running in-docker tests in the same conditions as CI (Gitlab)
#
# example:
# ./scripts/run_docker_test.sh docker/Dockerfile.debian.testing \
Expand Down Expand Up @@ -51,4 +51,7 @@ docker build -t "${IMG_TAG}" -f "$DOCKERFILE" .
OPTS_STR=${DOCKER_OPTS[@]+"${DOCKER_OPTS[@]}"}

# run under current user, mounting current directory at the same location in the container
#
# note: we've switched back to running the tests as root on CI when we switched from Jenkins to Gitlab
# it would be great to revert to the old way at some point
docker run -u "$(id -u):$(id -g)" -v "$PWD:$PWD" -w "$PWD" --rm $OPTS_STR -it "${IMG_TAG}" "$@"
1 change: 0 additions & 1 deletion scripts/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
set -euo pipefail

GITREPO_ROOT="${1:-$(readlink -f "$(dirname "$0")/..")}"
JENKINS_RUN=${JENKINS_RUN:-}
TRAVIS_COMMIT=${TRAVIS_COMMIT:-}

# Test options: test stages, additional checkers, compile options
Expand Down
3 changes: 1 addition & 2 deletions tests/run_vector_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ HARDWARE_ID=test_primary_hardware_id

"$TTV_DIR/generator.py" --signature-encoding base64 -o vectors --cjson json-subset \
--ecu-identifier $ECU_SERIAL --hardware-id $HARDWARE_ID
# disable werkzeug debug pin which causes issues on Jenkins
WERKZEUG_DEBUG_PIN=off "$TTV_DIR/server.py" --signature-encoding base64 -P 0 \
"$TTV_DIR/server.py" --signature-encoding base64 -P 0 \
--ecu-identifier $ECU_SERIAL --hardware-id $HARDWARE_ID &
PORT=$("$TESTS_SRC_DIR/find_listening_port.sh" $!)
trap 'kill %1' EXIT
Expand Down
2 changes: 1 addition & 1 deletion tests/tuf-test-vectors
Submodule tuf-test-vectors updated 1 files
+3 −1 server.py