aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org>2022-12-15 18:59:44 +0100
committerMarcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org>2022-12-15 18:59:44 +0100
commita0b9a9704d5d799f99a5cfa7923cb1209da16ac3 (patch)
tree7fa699a94b4f85d597df26779d0f93f82eeef242 /tools
parent9e06e70ebb7f4afb07a5fa5c193e2a9c04e577db (diff)
downloadkolla-a0b9a9704d5d799f99a5cfa7923cb1209da16ac3.tar.gz
kolla-a0b9a9704d5d799f99a5cfa7923cb1209da16ac3.zip
CI: do not check for error in binary images
There are no such anymore. Change-Id: Icf7d1988aa7208cda1b6f70269b9b54cd201b730
Diffstat (limited to 'tools')
-rwxr-xr-xtools/validate-all-dockerfiles.sh2
-rwxr-xr-xtools/validate-binary-build.sh48
2 files changed, 0 insertions, 50 deletions
diff --git a/tools/validate-all-dockerfiles.sh b/tools/validate-all-dockerfiles.sh
index f840c1a8a..893875ee6 100755
--- a/tools/validate-all-dockerfiles.sh
+++ b/tools/validate-all-dockerfiles.sh
@@ -15,6 +15,4 @@ find docker -name Dockerfile.j2 -print0 |
find docker -name Dockerfile.j2 -print0 |
xargs -0 tools/validate-indentation.sh || RES=1
-tools/validate-binary-build.sh || RES=1
-
exit $RES
diff --git a/tools/validate-binary-build.sh b/tools/validate-binary-build.sh
deleted file mode 100755
index b0d5c0014..000000000
--- a/tools/validate-binary-build.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-# Move to top level directory
-REAL_PATH=$(realpath $0)
-cd "$(dirname "$REAL_PATH")/.."
-
-RES=0
-
-generate_templates () {
- echo Generating templates for $distro
- tools/build.py --template-only --type binary --base $distro --work-dir=$tmpdir
-}
-
-check_for_errors () {
- regex=$1
- # Look for all rendered Dockerfile.
- # TODO(mwhahaha): Skip kolla-toolbox for now as it's dependent on specific
- # set of pip installed items.
- find $tmpdir/docker -not -path "*kolla-toolbox*" -name Dockerfile -print0 |
- xargs -0 egrep --color "$regex"
- # NOTE(mandre) grep returns status code of 1 if the expression isn't found
- # xargs returns with status 123 when the command invocation returns with an
- # exit status 1-125, this is what we should be looking for as our "everything
- # is good" code.
- if [ $? -ne 123 ]; then
- RES=1
- fi
-}
-
-echo Looking for forbidden instructions in binary image templates
-
-for distro in debian ubuntu centos; do
- tmpdir=$(mktemp -d kolla-templates.XXXXXX --tmpdir)
- generate_templates
- check_for_errors "gem .*install"
- check_for_errors "pip .*install"
- check_for_errors "npm .*install"
- check_for_errors "git .*clone"
- check_for_errors "wget"
- check_for_errors "curl"
- rm -r $tmpdir
-done
-
-if [ $RES -eq 1 ]; then
- echo "ERROR Found forbidden instructions in binary image templates"
-fi
-# Let's not make it fail pep8 job for now
-#exit $RES