remove code duplication in run-*.sh
These shell scripts have code duplication for defensive checking variables of ORG and PROJECT Change-Id: I72a900d5c8ee105cf91d27a3cdf7068f91dec329
This commit is contained in:
DennyZhang
parent
8e8396e3cc
commit
57a8bf659e
49
modules/jenkins/files/slave_scripts/functions.sh
Executable file
49
modules/jenkins/files/slave_scripts/functions.sh
Executable file
@ -0,0 +1,49 @@
|
||||
#
|
||||
# Copyright 2013 OpenStack Foundation
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
#
|
||||
# helper functions
|
||||
|
||||
function check_variable_org_project()
|
||||
{
|
||||
org=$1
|
||||
project=$2
|
||||
filename=$3
|
||||
|
||||
if [[ -z "$org" || -z "$project" ]]
|
||||
then
|
||||
echo "Usage: $filename ORG PROJECT"
|
||||
echo
|
||||
echo "ORG: The project organization (eg 'openstack')"
|
||||
echo "PROJECT: The project name (eg 'nova')"
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
function check_variable_version_org_project()
|
||||
{
|
||||
version=$1
|
||||
org=$2
|
||||
project=$3
|
||||
filename=$4
|
||||
if [[ -z "$version" || -z "$org" || -z "$project" ]]
|
||||
then
|
||||
echo "Usage: $filename VERSION ORG PROJECT"
|
||||
echo
|
||||
echo "VERSION: The tox environment python version (eg '27')"
|
||||
echo "ORG: The project organization (eg 'openstack')"
|
||||
echo "PROJECT: The project name (eg 'nova')"
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
@ -17,14 +17,8 @@
|
||||
org=$1
|
||||
project=$2
|
||||
|
||||
if [[ -z "$org" || -z "$project" ]]
|
||||
then
|
||||
echo "Usage: $0 ORG PROJECT"
|
||||
echo
|
||||
echo "ORG: The project organization (eg 'openstack')"
|
||||
echo "PROJECT: The project name (eg 'nova')"
|
||||
exit 1
|
||||
fi
|
||||
source /usr/local/jenkins/slave_scripts/functions.sh
|
||||
check_variable_org_project "$org" "$project" "$0"
|
||||
|
||||
source /usr/local/jenkins/slave_scripts/select-mirror.sh $org $project
|
||||
|
||||
|
||||
@ -7,14 +7,8 @@
|
||||
org=$1
|
||||
project=$2
|
||||
|
||||
if [[ -z "$org" || -z "$project" ]]
|
||||
then
|
||||
echo "Usage: $0 ORG PROJECT"
|
||||
echo
|
||||
echo "ORG: The project organization (eg 'openstack')"
|
||||
echo "PROJECT: The project name (eg 'nova')"
|
||||
exit 1
|
||||
fi
|
||||
source /usr/local/jenkins/slave_scripts/functions.sh
|
||||
check_variable_org_project "$org" "$project" "$0"
|
||||
|
||||
source /usr/local/jenkins/slave_scripts/select-mirror.sh $org $project
|
||||
|
||||
|
||||
@ -10,14 +10,8 @@
|
||||
org=$1
|
||||
project=$2
|
||||
|
||||
if [[ -z "$org" || -z "$project" ]]
|
||||
then
|
||||
echo "Usage: $0 ORG PROJECT"
|
||||
echo
|
||||
echo "ORG: The project organization (eg 'openstack')"
|
||||
echo "PROJECT: The project name (eg 'nova')"
|
||||
exit 1
|
||||
fi
|
||||
source /usr/local/jenkins/slave_scripts/functions.sh
|
||||
check_variable_org_project "$org" "$project" "$0"
|
||||
|
||||
source /usr/local/jenkins/slave_scripts/select-mirror.sh $org $project
|
||||
|
||||
|
||||
10
modules/jenkins/files/slave_scripts/run-pep8.sh
Normal file → Executable file
10
modules/jenkins/files/slave_scripts/run-pep8.sh
Normal file → Executable file
@ -17,14 +17,8 @@
|
||||
org=$1
|
||||
project=$2
|
||||
|
||||
if [[ -z "$org" || -z "$project" ]]
|
||||
then
|
||||
echo "Usage: $0 ORG PROJECT"
|
||||
echo
|
||||
echo "ORG: The project organization (eg 'openstack')"
|
||||
echo "PROJECT: The project name (eg 'nova')"
|
||||
exit 1
|
||||
fi
|
||||
source /usr/local/jenkins/slave_scripts/functions.sh
|
||||
check_variable_org_project "$org" "$project" "$0"
|
||||
|
||||
source /usr/local/jenkins/slave_scripts/select-mirror.sh $org $project
|
||||
|
||||
|
||||
10
modules/jenkins/files/slave_scripts/run-pylint.sh
Normal file → Executable file
10
modules/jenkins/files/slave_scripts/run-pylint.sh
Normal file → Executable file
@ -17,14 +17,8 @@
|
||||
org=$1
|
||||
project=$2
|
||||
|
||||
if [[ -z "$org" || -z "$project" ]]
|
||||
then
|
||||
echo "Usage: $0 ORG PROJECT"
|
||||
echo
|
||||
echo "ORG: The project organization (eg 'openstack')"
|
||||
echo "PROJECT: The project name (eg 'nova')"
|
||||
exit 1
|
||||
fi
|
||||
source /usr/local/jenkins/slave_scripts/functions.sh
|
||||
check_variable_org_project "$org" "$project" "$0"
|
||||
|
||||
source /usr/local/jenkins/slave_scripts/select-mirror.sh $org $project
|
||||
|
||||
|
||||
@ -10,14 +10,8 @@
|
||||
org=$1
|
||||
project=$2
|
||||
|
||||
if [[ -z "$org" || -z "$project" ]]
|
||||
then
|
||||
echo "Usage: $0 ORG PROJECT"
|
||||
echo
|
||||
echo "ORG: The project organization (eg 'openstack')"
|
||||
echo "PROJECT: The project name (eg 'nova')"
|
||||
exit 1
|
||||
fi
|
||||
source /usr/local/jenkins/slave_scripts/functions.sh
|
||||
check_variable_org_project "$org" "$project" "$0"
|
||||
|
||||
source /usr/local/jenkins/slave_scripts/select-mirror.sh $org $project
|
||||
|
||||
|
||||
10
modules/jenkins/files/slave_scripts/run-tarball.sh
Normal file → Executable file
10
modules/jenkins/files/slave_scripts/run-tarball.sh
Normal file → Executable file
@ -17,14 +17,8 @@
|
||||
org=$1
|
||||
project=$2
|
||||
|
||||
if [[ -z "$org" || -z "$project" ]]
|
||||
then
|
||||
echo "Usage: $0 ORG PROJECT"
|
||||
echo
|
||||
echo "ORG: The project organization (eg 'openstack')"
|
||||
echo "PROJECT: The project name (eg 'nova')"
|
||||
exit 1
|
||||
fi
|
||||
source /usr/local/jenkins/slave_scripts/functions.sh
|
||||
check_variable_org_project "$org" "$project" "$0"
|
||||
|
||||
source /usr/local/jenkins/slave_scripts/select-mirror.sh $org $project
|
||||
|
||||
|
||||
@ -14,15 +14,8 @@ version=$1
|
||||
org=$2
|
||||
project=$3
|
||||
|
||||
if [[ -z "$version" || -z "$org" || -z "$project" ]]
|
||||
then
|
||||
echo "Usage: $? VERSION ORG PROJECT"
|
||||
echo
|
||||
echo "VERSION: The tox environment python version (eg '27')"
|
||||
echo "ORG: The project organization (eg 'openstack')"
|
||||
echo "PROJECT: The project name (eg 'nova')"
|
||||
exit 1
|
||||
fi
|
||||
source /usr/local/jenkins/slave_scripts/functions.sh
|
||||
check_variable_version_org_project "$version" "$org" "$project" "$0"
|
||||
|
||||
venv=py$version
|
||||
|
||||
|
||||
@ -17,14 +17,8 @@
|
||||
org=$1
|
||||
project=$2
|
||||
|
||||
if [[ -z "$org" || -z "$project" ]]
|
||||
then
|
||||
echo "Usage: $0 ORG PROJECT"
|
||||
echo
|
||||
echo "ORG: The project organization (eg 'openstack')"
|
||||
echo "PROJECT: The project name (eg 'nova')"
|
||||
exit 1
|
||||
fi
|
||||
source /usr/local/jenkins/slave_scripts/functions.sh
|
||||
check_variable_org_project "$org" "$project" "$0"
|
||||
|
||||
rm -f ~/.pydistutils.cfg
|
||||
mkdir -p ~/.pip
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user