diff --git a/modules/openstack_project/files/slave_scripts/functions.sh b/modules/openstack_project/files/slave_scripts/functions.sh deleted file mode 100755 index ef013eb2ce..0000000000 --- a/modules/openstack_project/files/slave_scripts/functions.sh +++ /dev/null @@ -1,49 +0,0 @@ -# -# 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 -} diff --git a/modules/openstack_project/files/slave_scripts/propose_translation_update.sh b/modules/openstack_project/files/slave_scripts/propose_translation_update.sh index 5d5065abf1..4a1e0f512f 100755 --- a/modules/openstack_project/files/slave_scripts/propose_translation_update.sh +++ b/modules/openstack_project/files/slave_scripts/propose_translation_update.sh @@ -12,14 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -# Transitional backward compat test which can get removed once jobs are only -# calling this with one parameter -if [ -n "$2" ] -then - PROJECT=$2 -else - PROJECT=$1 -fi +PROJECT=$1 source /usr/local/jenkins/slave_scripts/common_translation_update.sh diff --git a/modules/openstack_project/files/slave_scripts/select-mirror.sh b/modules/openstack_project/files/slave_scripts/select-mirror.sh deleted file mode 100755 index 4a9df3f513..0000000000 --- a/modules/openstack_project/files/slave_scripts/select-mirror.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -x - -# 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. - -mkdir -p ~/.pip - -cat < ~/.pydistutils.cfg -[easy_install] -index_url = http://pypi.openstack.org/simple -EOF -cat < ~/.pip/pip.conf -[global] -index-url = http://pypi.openstack.org/simple -timeout = 60 -EOF