mirror of https://gerrit.osmocom.org/osmo-ci
cosmetic: remove wrapper script
The jenkins.sh is just a tiny wrapper around coverity_Osmocom.sh - let's remove this unnecessary indirection and move the code directly to jenkins.sh Change-Id: Iead3b8f39327f1d0dd80e12a9d38563c35701993
This commit is contained in:
parent
f086d63c13
commit
1239cabeea
|
@ -1,38 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
set -e -x
|
|
||||||
|
|
||||||
base_dir="$PWD"
|
|
||||||
src_dir="$base_dir/source-Osmocom"
|
|
||||||
cov_dir="$src_dir/cov-int"
|
|
||||||
|
|
||||||
rm -rf "$src_dir"
|
|
||||||
./prepare_source_Osmcocom.sh
|
|
||||||
|
|
||||||
export PATH="$base_dir/cov-analysis-linux64-8.5.0/bin/:$PATH"
|
|
||||||
|
|
||||||
rm -rf "$cov_dir"
|
|
||||||
cov-build --dir "$cov_dir" ./build_Osmocom.sh
|
|
||||||
|
|
||||||
cd "$src_dir"
|
|
||||||
rm -f Osmocom.tgz
|
|
||||||
tar czf Osmocom.tgz cov-int
|
|
||||||
|
|
||||||
# Don't leak the token to jenkins build logs, but still log the call:
|
|
||||||
# First compose the call to echo, then run with token inserted by 'eval'.
|
|
||||||
set +x
|
|
||||||
|
|
||||||
curl_cmd='curl \
|
|
||||||
--form token="$token" \
|
|
||||||
--form email=holger@freyther.de --form file=@Osmocom.tgz \
|
|
||||||
--form version=Version --form description=AutoUpload \
|
|
||||||
https://scan.coverity.com/builds?project=Osmocom'
|
|
||||||
echo "$curl_cmd"
|
|
||||||
|
|
||||||
token="$($base_dir/get_token.sh $base_dir/tokens.txt Osmocom)"
|
|
||||||
if [ -z "$token" ]; then
|
|
||||||
echo "TOKEN IS EMPTY"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
eval "$curl_cmd"
|
|
|
@ -1,2 +1,38 @@
|
||||||
#!/bin/sh
|
#!/usr/bin/env bash
|
||||||
./coverity_Osmocom.sh
|
|
||||||
|
set -e -x
|
||||||
|
|
||||||
|
base_dir="$PWD"
|
||||||
|
src_dir="$base_dir/source-Osmocom"
|
||||||
|
cov_dir="$src_dir/cov-int"
|
||||||
|
|
||||||
|
rm -rf "$src_dir"
|
||||||
|
./prepare_source_Osmcocom.sh
|
||||||
|
|
||||||
|
export PATH="$base_dir/cov-analysis-linux64-8.5.0/bin/:$PATH"
|
||||||
|
|
||||||
|
rm -rf "$cov_dir"
|
||||||
|
cov-build --dir "$cov_dir" ./build_Osmocom.sh
|
||||||
|
|
||||||
|
cd "$src_dir"
|
||||||
|
rm -f Osmocom.tgz
|
||||||
|
tar czf Osmocom.tgz cov-int
|
||||||
|
|
||||||
|
# Don't leak the token to jenkins build logs, but still log the call:
|
||||||
|
# First compose the call to echo, then run with token inserted by 'eval'.
|
||||||
|
set +x
|
||||||
|
|
||||||
|
curl_cmd='curl \
|
||||||
|
--form token="$token" \
|
||||||
|
--form email=holger@freyther.de --form file=@Osmocom.tgz \
|
||||||
|
--form version=Version --form description=AutoUpload \
|
||||||
|
https://scan.coverity.com/builds?project=Osmocom'
|
||||||
|
echo "$curl_cmd"
|
||||||
|
|
||||||
|
token="$($base_dir/get_token.sh $base_dir/tokens.txt Osmocom)"
|
||||||
|
if [ -z "$token" ]; then
|
||||||
|
echo "TOKEN IS EMPTY"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
eval "$curl_cmd"
|
||||||
|
|
Loading…
Reference in New Issue