opendev/system-config
Code Issues Proposed changes

Merge "Stop using select-mirror in slave scripts"

Browse Source
This commit is contained in:
Jenkins 2014-08-01 22:27:02 +00:00 committed by Gerrit Code Review
commit 98964165ac
16 changed files with 16 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/openstack_project/files/slave_scripts/common_translation_update.sh
View File

@ -149,9 +149,7 @@ function setup_git ()
# COMMIT_MSG. # COMMIT_MSG.
function setup_review () function setup_review ()
{ {
local ORG="$1" FULL_PROJECT=$(grep project .gitreview | cut -f2 -d= | cut -f1 -d.)
local PROJECT="$2"
COMMIT_MSG="Imported Translations from Transifex" COMMIT_MSG="Imported Translations from Transifex"
git review -s git review -s
@ -159,7 +157,7 @@ function setup_review ()
# See if there is an open change in the transifex/translations # See if there is an open change in the transifex/translations
# topic. If so, get the change id for the existing change for use # topic. If so, get the change id for the existing change for use
# in the commit msg. # in the commit msg.
change_info=`ssh -p 29418 proposal-bot@review.openstack.org gerrit query --current-patch-set status:open project:$ORG/$PROJECT topic:transifex/translations owner:proposal-bot` change_info=`ssh -p 29418 proposal-bot@review.openstack.org gerrit query --current-patch-set status:open project:$FULL_PROJECT topic:transifex/translations owner:proposal-bot`
previous=`echo "$change_info" | grep "^ number:" | awk '{print $2}'` previous=`echo "$change_info" | grep "^ number:" | awk '{print $2}'`
if [ "x${previous}" != "x" ] ; then if [ "x${previous}" != "x" ] ; then
change_id=`echo "$change_info" | grep "^change" | awk '{print $2}'` change_id=`echo "$change_info" | grep "^change" | awk '{print $2}'`

12
modules/openstack_project/files/slave_scripts/propose_translation_update.sh
View File

@ -12,14 +12,20 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
ORG=$1 # Transitional backward compat test which can get removed once jobs are only
PROJECT=$2 # calling this with one parameter
if [ -n "$2" ]
then
PROJECT=$2
else
PROJECT=$1
fi
source /usr/local/jenkins/slave_scripts/common_translation_update.sh source /usr/local/jenkins/slave_scripts/common_translation_update.sh
setup_git setup_git
setup_review "$ORG" "$PROJECT" setup_review
setup_translation setup_translation
setup_project "$PROJECT" setup_project "$PROJECT"

4
modules/openstack_project/files/slave_scripts/propose_translation_update_django_openstack_auth.sh
View File

@ -12,15 +12,13 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
ORG=openstack
PROJECT=django_openstack_auth
COMMIT_MSG="Imported Translations from Transifex" COMMIT_MSG="Imported Translations from Transifex"
source /usr/local/jenkins/slave_scripts/common_translation_update.sh source /usr/local/jenkins/slave_scripts/common_translation_update.sh
setup_git setup_git
setup_review "$ORG" "$PROJECT" setup_review
setup_django_openstack_auth setup_django_openstack_auth

5
modules/openstack_project/files/slave_scripts/propose_translation_update_horizon.sh
View File

@ -12,14 +12,11 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
ORG=openstack
PROJECT=horizon
source /usr/local/jenkins/slave_scripts/common_translation_update.sh source /usr/local/jenkins/slave_scripts/common_translation_update.sh
setup_git setup_git
setup_review "$ORG" "$PROJECT" setup_review
setup_translation setup_translation
setup_horizon setup_horizon

3
modules/openstack_project/files/slave_scripts/propose_translation_update_manuals.sh
View File

@ -17,7 +17,6 @@
# The script is to pull the translations from Transifex, # The script is to pull the translations from Transifex,
# and push to Gerrit. # and push to Gerrit.
ORG="openstack"
PROJECT=$1 PROJECT=$1
source /usr/local/jenkins/slave_scripts/common_translation_update.sh source /usr/local/jenkins/slave_scripts/common_translation_update.sh
@ -25,7 +24,7 @@ source /usr/local/jenkins/slave_scripts/common_translation_update.sh
init_manuals "$PROJECT" init_manuals "$PROJECT"
setup_git setup_git
setup_review "$ORG" "$PROJECT" setup_review
setup_translation setup_translation
setup_manuals "$PROJECT" setup_manuals "$PROJECT"

8
modules/openstack_project/files/slave_scripts/run-bashate.sh
View File

@ -14,14 +14,6 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
org=$1
project=$2
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
set -o pipefail set -o pipefail
./run_tests.sh ./run_tests.sh
set +o pipefail set +o pipefail

8
modules/openstack_project/files/slave_scripts/run-cover.sh
View File

@ -4,14 +4,6 @@
# resulting environment at the end so that we have a record of exactly # resulting environment at the end so that we have a record of exactly
# what packages we ended up testing. # what packages we ended up testing.
org=$1
project=$2
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
export NOSE_COVER_HTML=1 export NOSE_COVER_HTML=1
venv=cover venv=cover

8
modules/openstack_project/files/slave_scripts/run-docs.sh
View File

@ -7,14 +7,6 @@
# what packages we ended up testing. # what packages we ended up testing.
# #
org=$1
project=$2
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
venv=venv venv=venv
echo "Begin pip freeze output from test virtualenv:" echo "Begin pip freeze output from test virtualenv:"

7
modules/openstack_project/files/slave_scripts/run-jsbuild.sh
View File

@ -14,13 +14,6 @@
# under the License. # under the License.
command=$1 command=$1
org=$2
project=$3
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
rm -f dist/*.tar.gz rm -f dist/*.tar.gz

8
modules/openstack_project/files/slave_scripts/run-pep8.sh
View File

@ -14,14 +14,6 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
org=$1
project=$2
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
set -o pipefail set -o pipefail
tox -v -epep8 | tee pep8.txt tox -v -epep8 | tee pep8.txt
set +o pipefail set +o pipefail

8
modules/openstack_project/files/slave_scripts/run-pylint.sh
View File

@ -14,14 +14,6 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
org=$1
project=$2
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
set -o pipefail set -o pipefail
tox -v -epylint | tee pylint.txt tox -v -epylint | tee pylint.txt
set +o pipefail set +o pipefail

8
modules/openstack_project/files/slave_scripts/run-selenium.sh
View File

@ -7,14 +7,6 @@
# what packages we ended up testing. # what packages we ended up testing.
# #
org=$1
project=$2
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
venv=venv venv=venv
VDISPLAY=99 VDISPLAY=99

8
modules/openstack_project/files/slave_scripts/run-tarball.sh
View File

@ -14,14 +14,6 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
org=$1
project=$2
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
rm -f dist/*.tar.gz rm -f dist/*.tar.gz
tox -evenv python setup.py sdist tox -evenv python setup.py sdist

10
modules/openstack_project/files/slave_scripts/run-tox.sh
View File

@ -12,16 +12,12 @@
# project's tox.ini file). # project's tox.ini file).
venv=$1 venv=$1
org=$2
project=$3
if [[ -z "$venv" || -z "$org" || -z "$project" ]] if [[ -z "$venv" ]]
then then
echo "Usage: $? VENV ORG PROJECT" echo "Usage: $?"
echo echo
echo "VENV: The tox environment to run (eg 'python27')" echo "VENV: The tox environment to run (eg 'python27')"
echo "ORG: The project organization (eg 'stackforge')"
echo "PROJECT: The project name (eg 'nova')"
exit 1 exit 1
fi fi
@ -29,8 +25,6 @@ fi
sudo /usr/local/jenkins/slave_scripts/jenkins-sudo-grep.sh pre sudo /usr/local/jenkins/slave_scripts/jenkins-sudo-grep.sh pre
source /usr/local/jenkins/slave_scripts/select-mirror.sh $org $project
tox -v -e$venv tox -v -e$venv
result=$? result=$?

7
modules/openstack_project/files/slave_scripts/run-unittests.sh
View File

@ -11,11 +11,6 @@
# "py27"/"jenkins27" respectively. # "py27"/"jenkins27" respectively.
version=$1 version=$1
org=$2
project=$3
source /usr/local/jenkins/slave_scripts/functions.sh
check_variable_version_org_project "$version" "$org" "$project" "$0"
venv=py$version venv=py$version
@ -29,8 +24,6 @@ trap "rm -rf $TMPDIR" EXIT
sudo /usr/local/jenkins/slave_scripts/jenkins-sudo-grep.sh pre sudo /usr/local/jenkins/slave_scripts/jenkins-sudo-grep.sh pre
source /usr/local/jenkins/slave_scripts/select-mirror.sh $org $project
tox -e$venv tox -e$venv
result=$? result=$?

14
modules/openstack_project/files/slave_scripts/run-wheel.sh
View File

@ -14,20 +14,6 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
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/select-mirror.sh $org $project
rm -f dist/*.whl rm -f dist/*.whl
tox -evenv pip install wheel tox -evenv pip install wheel
tox -evenv python setup.py bdist_wheel tox -evenv python setup.py bdist_wheel