kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #40050 from thaJeztah/ci_force_validate 

Jenkinsfile: force validate on master, and some fixes/improvements
This commit is contained in:
Sebastiaan van Stijn 2019-12-23 13:39:43 +01:00 committed by GitHub
parent 1a960fed45 d3c0261876
commit bbcabf69c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 57 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Jenkinsfile vendored
View File

@ -9,6 +9,7 @@ pipeline {
} }
parameters { parameters {
booleanParam(name: 'unit_validate', defaultValue: true, description: 'amd64 (x86_64) unit tests and vendor check') booleanParam(name: 'unit_validate', defaultValue: true, description: 'amd64 (x86_64) unit tests and vendor check')
booleanParam(name: 'validate_force', defaultValue: false, description: 'force validation steps to be run, even if no changes were detected')
booleanParam(name: 'amd64', defaultValue: true, description: 'amd64 (x86_64) Build/Test') booleanParam(name: 'amd64', defaultValue: true, description: 'amd64 (x86_64) Build/Test')
booleanParam(name: 'arm64', defaultValue: true, description: 'ARM (arm64) Build/Test') booleanParam(name: 'arm64', defaultValue: true, description: 'ARM (arm64) Build/Test')
booleanParam(name: 's390x', defaultValue: true, description: 'IBM Z (s390x) Build/Test') booleanParam(name: 's390x', defaultValue: true, description: 'IBM Z (s390x) Build/Test')
@ -62,6 +63,12 @@ pipeline {
expression { params.unit_validate } expression { params.unit_validate }
} }
agent { label 'amd64 && ubuntu-1804 && overlay2' } agent { label 'amd64 && ubuntu-1804 && overlay2' }
environment {
// On master ("non-pull-request"), force running some validation checks (vendor, swagger),
// even if no files were changed. This allows catching problems caused by pull-requests
// that were merged out-of-sequence.
TEST_FORCE_VALIDATE = sh returnStdout: true, script: 'if [ "${BRANCH_NAME%%-*}" != "PR" ] || [ "${CHANGE_TARGET:-master}" != "master" ] || [ "${validate_force}" = "true" ]; then echo "1"; fi'
}
stages { stages {
stage("Print info") { stage("Print info") {
@ -90,6 +97,7 @@ pipeline {
-e DOCKER_EXPERIMENTAL \ -e DOCKER_EXPERIMENTAL \
-e DOCKER_GITCOMMIT=${GIT_COMMIT} \ -e DOCKER_GITCOMMIT=${GIT_COMMIT} \
-e DOCKER_GRAPHDRIVER \ -e DOCKER_GRAPHDRIVER \
-e TEST_FORCE_VALIDATE \
-e VALIDATE_REPO=${GIT_URL} \ -e VALIDATE_REPO=${GIT_URL} \
-e VALIDATE_BRANCH=${CHANGE_TARGET} \ -e VALIDATE_BRANCH=${CHANGE_TARGET} \
docker:${GIT_COMMIT} \ docker:${GIT_COMMIT} \
@ -197,6 +205,7 @@ pipeline {
-e DOCKER_EXPERIMENTAL \ -e DOCKER_EXPERIMENTAL \
-e DOCKER_GITCOMMIT=${GIT_COMMIT} \ -e DOCKER_GITCOMMIT=${GIT_COMMIT} \
-e DOCKER_GRAPHDRIVER \ -e DOCKER_GRAPHDRIVER \
-e TEST_FORCE_VALIDATE \
-e VALIDATE_REPO=${GIT_URL} \ -e VALIDATE_REPO=${GIT_URL} \
-e VALIDATE_BRANCH=${CHANGE_TARGET} \ -e VALIDATE_BRANCH=${CHANGE_TARGET} \
docker:${GIT_COMMIT} \ docker:${GIT_COMMIT} \

1
Makefile
View File

@ -65,6 +65,7 @@ DOCKER_ENVS := \
-e DOCKER_TEST_HOST \ -e DOCKER_TEST_HOST \
-e DOCKER_USERLANDPROXY \ -e DOCKER_USERLANDPROXY \
-e DOCKERD_ARGS \ -e DOCKERD_ARGS \
-e TEST_FORCE_VALIDATE \
-e TEST_INTEGRATION_DIR \ -e TEST_INTEGRATION_DIR \
-e TEST_SKIP_INTEGRATION \ -e TEST_SKIP_INTEGRATION \
-e TEST_SKIP_INTEGRATION_CLI \ -e TEST_SKIP_INTEGRATION_CLI \

20
hack/validate/default
View File

@ -4,13 +4,13 @@
export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
. ${SCRIPTDIR}/dco . "${SCRIPTDIR}"/dco
. ${SCRIPTDIR}/default-seccomp . "${SCRIPTDIR}"/default-seccomp
. ${SCRIPTDIR}/golangci-lint . "${SCRIPTDIR}"/pkg-imports
. ${SCRIPTDIR}/pkg-imports . "${SCRIPTDIR}"/swagger
. ${SCRIPTDIR}/swagger . "${SCRIPTDIR}"/swagger-gen
. ${SCRIPTDIR}/swagger-gen . "${SCRIPTDIR}"/toml
. ${SCRIPTDIR}/toml . "${SCRIPTDIR}"/changelog-well-formed
. ${SCRIPTDIR}/changelog-well-formed . "${SCRIPTDIR}"/changelog-date-descending
. ${SCRIPTDIR}/changelog-date-descending . "${SCRIPTDIR}"/deprecate-integration-cli
#. ${SCRIPTDIR}/deprecate-integration-cli . "${SCRIPTDIR}"/golangci-lint

2
hack/validate/default-seccomp
View File

@ -7,7 +7,7 @@ IFS=$'\n'
files=( $(validate_diff --diff-filter=ACMR --name-only -- 'profiles/seccomp' || true) ) files=( $(validate_diff --diff-filter=ACMR --name-only -- 'profiles/seccomp' || true) )
unset IFS unset IFS
if [ ${#files[@]} -gt 0 ]; then if [ -n "${TEST_FORCE_VALIDATE:-}" ] || [ ${#files[@]} -gt 0 ]; then
# We run 'go generate' and see if we have a diff afterwards # We run 'go generate' and see if we have a diff afterwards
go generate ./profiles/seccomp/ >/dev/null go generate ./profiles/seccomp/ >/dev/null
# Let see if the working directory is clean # Let see if the working directory is clean

16
hack/validate/deprecate-integration-cli
View File

@ -5,15 +5,12 @@ export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source "${SCRIPTDIR}/.validate" source "${SCRIPTDIR}/.validate"
new_tests=$( new_tests=$(
validate_diff --diff-filter=ACMR --unified=0 -- 'integration-cli/*_cli_*.go' | validate_diff --diff-filter=ACMR --unified=0 -- 'integration-cli/*_api_*.go' 'integration-cli/*_cli_*.go' |
grep -E '^\+func (.*) Test' || true grep -E '^\+func (.*) Test' || true
) )
if [ -z "$new_tests" ]; then if [ -n "$new_tests" ]; then
echo 'Congratulations! No new tests added to integration-cli.' {
exit
fi
echo "The following new tests were added to integration-cli:" echo "The following new tests were added to integration-cli:"
echo echo
echo "$new_tests" echo "$new_tests"
@ -21,5 +18,8 @@ echo
echo "integration-cli is deprecated. Please add an API integration test to" echo "integration-cli is deprecated. Please add an API integration test to"
echo "./integration/COMPONENT/. See ./TESTING.md for more details." echo "./integration/COMPONENT/. See ./TESTING.md for more details."
echo echo
} >&2
exit 1 false
else
echo 'Congratulations! No new tests were added to integration-cli.'
fi

2
hack/validate/golangci-lint
View File

@ -17,6 +17,8 @@ elif ${PKG_CONFIG} 'libsystemd-journal' 2> /dev/null ; then
DOCKER_BUILDTAGS+=" journald journald_compat" DOCKER_BUILDTAGS+=" journald journald_compat"
fi fi
echo -e "\n\033[0;36mINFO\033[0m Start validation with golang-ci-lint"
# TODO use --out-format=junit-xml and store artifacts # TODO use --out-format=junit-xml and store artifacts
# shellcheck disable=SC2086 # shellcheck disable=SC2086
GOGC=75 golangci-lint run \ GOGC=75 golangci-lint run \

2
hack/validate/pkg-imports
View File

@ -20,7 +20,7 @@ for f in "${files[@]}"; do
done done
if [ ${#badFiles[@]} -eq 0 ]; then if [ ${#badFiles[@]} -eq 0 ]; then
echo 'Congratulations! "./pkg/..." is safely isolated from internal code.' echo 'Congratulations! Packages in "./pkg/..." are safely isolated from internal code.'
else else
{ {
echo 'These files import internal code: (either directly or indirectly)' echo 'These files import internal code: (either directly or indirectly)'

11
hack/validate/swagger
View File

@ -7,7 +7,12 @@ IFS=$'\n'
files=( $(validate_diff --diff-filter=ACMR --name-only -- 'api/swagger.yaml' || true) ) files=( $(validate_diff --diff-filter=ACMR --name-only -- 'api/swagger.yaml' || true) )
unset IFS unset IFS
if [ ${#files[@]} -gt 0 ]; then if [ -n "${TEST_FORCE_VALIDATE:-}" ] || [ ${#files[@]} -gt 0 ]; then
LANG=C.UTF-8 yamllint -c ${SCRIPTDIR}/.swagger-yamllint api/swagger.yaml LANG=C.UTF-8 yamllint -c "${SCRIPTDIR}"/.swagger-yamllint api/swagger.yaml
swagger validate api/swagger.yaml if out=$(swagger validate api/swagger.yaml); then
echo "Congratulations! ${out}"
else
echo "${out}" >&2
false
fi
fi fi

10
hack/validate/swagger-gen
View File

@ -7,8 +7,8 @@ IFS=$'\n'
files=( $(validate_diff --diff-filter=ACMR --name-only -- 'api/types/' 'api/swagger.yaml' || true) ) files=( $(validate_diff --diff-filter=ACMR --name-only -- 'api/types/' 'api/swagger.yaml' || true) )
unset IFS unset IFS
if [ ${#files[@]} -gt 0 ]; then if [ -n "${TEST_FORCE_VALIDATE:-}" ] || [ ${#files[@]} -gt 0 ]; then
${SCRIPTDIR}/../generate-swagger-api.sh 2> /dev/null "${SCRIPTDIR}"/../generate-swagger-api.sh 2> /dev/null
# Let see if the working directory is clean # Let see if the working directory is clean
diffs="$(git diff -- api/types/)" diffs="$(git diff -- api/types/)"
if [ "$diffs" ]; then if [ "$diffs" ]; then
@ -17,12 +17,12 @@ if [ ${#files[@]} -gt 0 ]; then
echo echo
echo "$diffs" echo "$diffs"
echo echo
echo 'Please update api/swagger.yaml with any api changes, then ' echo 'Please update api/swagger.yaml with any API changes, then '
echo 'run `hack/generate-swagger-api.sh`.' echo 'run hack/generate-swagger-api.sh.'
} >&2 } >&2
false false
else else
echo 'Congratulations! All api changes are done the right way.' echo 'Congratulations! All API changes are done the right way.'
fi fi
else else
echo 'No api/types/ or api/swagger.yaml changes in diff.' echo 'No api/types/ or api/swagger.yaml changes in diff.'

8
hack/validate/toml
View File

@ -9,22 +9,22 @@ unset IFS
badFiles=() badFiles=()
for f in "${files[@]}"; do for f in "${files[@]}"; do
# we use "git show" here to validate that what's committed has valid toml syntax # we use "git show" here to validate that what's committed has valid TOML syntax
if ! git show "$VALIDATE_HEAD:$f" | tomlv /proc/self/fd/0 ; then if ! git show "$VALIDATE_HEAD:$f" | tomlv /proc/self/fd/0 ; then
badFiles+=( "$f" ) badFiles+=( "$f" )
fi fi
done done
if [ ${#badFiles[@]} -eq 0 ]; then if [ ${#badFiles[@]} -eq 0 ]; then
echo 'Congratulations! All toml source files changed here have valid syntax.' echo 'Congratulations! All TOML source files changed here have valid syntax.'
else else
{ {
echo "These files are not valid toml:" echo "These files are not valid TOML:"
for f in "${badFiles[@]}"; do for f in "${badFiles[@]}"; do
echo " - $f" echo " - $f"
done done
echo echo
echo 'Please reformat the above files as valid toml' echo 'Please reformat the above files as valid TOML'
echo echo
} >&2 } >&2
false false

2
hack/validate/vendor
View File

@ -8,7 +8,7 @@ validate_vendor_diff(){
files=( $(validate_diff --diff-filter=ACMR --name-only -- 'vendor.conf' 'vendor/' || true) ) files=( $(validate_diff --diff-filter=ACMR --name-only -- 'vendor.conf' 'vendor/' || true) )
unset IFS unset IFS
if [ ${#files[@]} -gt 0 ]; then if [ -n "${TEST_FORCE_VALIDATE:-}" ] || [ ${#files[@]} -gt 0 ]; then
# recreate vendor/ # recreate vendor/
vndr vndr
# check if any files have changed # check if any files have changed