From ba8f2c963cd0d79354458698badf4b5deb71a884 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Thu, 9 Mar 2017 10:18:05 -0500 Subject: [PATCH] Replace exit 404 to exit 1 Per Vratko's suggestion in Id4b67cb38a6ba297e9e2cd3f9091a1666b9c955c Change-Id: Ibe607e43578e831dd1c88883f97c264b51657253 Signed-off-by: Thanh Ha --- jenkins-scripts/jenkins-init-script.sh | 2 +- jjb/autorelease/include-raw-autorelease-maven-deploy.sh | 2 +- jjb/include-raw-deploy-archives.sh | 2 +- jjb/include-raw-stage-release.sh | 2 +- jjb/netvirt/include-raw-openstack-ci.sh | 8 ++++---- jjb/neutron/include-raw-openstack-ci.sh | 8 ++++---- jjb/opendaylight-infra-stack.sh | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/jenkins-scripts/jenkins-init-script.sh b/jenkins-scripts/jenkins-init-script.sh index fc55c89c7..fe327e3f5 100755 --- a/jenkins-scripts/jenkins-init-script.sh +++ b/jenkins-scripts/jenkins-init-script.sh @@ -9,7 +9,7 @@ # http://www.eclipse.org/legal/epl-v10.html ############################################################################## -cd /builder/jenkins-scripts || exit 404 +cd /builder/jenkins-scripts || exit 1 chmod +x -- *.sh ./system_type.sh diff --git a/jjb/autorelease/include-raw-autorelease-maven-deploy.sh b/jjb/autorelease/include-raw-autorelease-maven-deploy.sh index 40f3b8230..3efacf878 100644 --- a/jjb/autorelease/include-raw-autorelease-maven-deploy.sh +++ b/jjb/autorelease/include-raw-autorelease-maven-deploy.sh @@ -10,7 +10,7 @@ ############################################################################## # Assuming that mvn deploy created the hide/from/pom/files/stage directory. -cd hide/from/pom/files || exit 404 +cd hide/from/pom/files || exit 1 mkdir -p m2repo/org/opendaylight/ # ODLNEXUSPROXY is used to define the location of the Nexus server used by the CI system. diff --git a/jjb/include-raw-deploy-archives.sh b/jjb/include-raw-deploy-archives.sh index 8fedd1ccd..b0351d1e6 100644 --- a/jjb/include-raw-deploy-archives.sh +++ b/jjb/include-raw-deploy-archives.sh @@ -25,7 +25,7 @@ ARCHIVES_DIR="$JENKINS_HOSTNAME/$JOB_NAME/$BUILD_NUMBER" echo "Build logs: $LOGS_SERVER/$SILO/$ARCHIVES_DIR" mkdir .archives -cd .archives/ || exit 404 +cd .archives/ || exit 1 cat > deploy-archives.xml < diff --git a/jjb/include-raw-stage-release.sh b/jjb/include-raw-stage-release.sh index 552bf4a06..2a224c670 100644 --- a/jjb/include-raw-stage-release.sh +++ b/jjb/include-raw-stage-release.sh @@ -10,7 +10,7 @@ ############################################################################## # Assuming that mvn deploy created the hide/from/pom/files/stage directory. -cd hide/from/pom/files || exit 404 +cd hide/from/pom/files || exit 1 mkdir -p m2repo/org/opendaylight/ rsync -avz --exclude 'maven-metadata*' \ diff --git a/jjb/netvirt/include-raw-openstack-ci.sh b/jjb/netvirt/include-raw-openstack-ci.sh index 88475dfe9..460676833 100644 --- a/jjb/netvirt/include-raw-openstack-ci.sh +++ b/jjb/netvirt/include-raw-openstack-ci.sh @@ -17,18 +17,18 @@ sudo chown -R jenkins:jenkins /opt/stack/new sudo bash -c 'echo "stack ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers' # We need to install some scripts from openstack/os-testr project -cd ~ || exit 404 +cd ~ || exit 1 echo "Setting up infra scripts" sudo mkdir -p /usr/local/jenkins/slave_scripts git clone https://github.com/openstack/os-testr.git -cd os-testr/os_testr || exit 404 +cd os-testr/os_testr || exit 1 sudo cp subunit2html.py /usr/local/jenkins/slave_scripts # Save existing WORKSPACE SAVED_WORKSPACE="$WORKSPACE" export WORKSPACE=~/workspace mkdir -p "$WORKSPACE" -cd "$WORKSPACE" || exit 404 +cd "$WORKSPACE" || exit 1 # This is the job which checks out devstack-gate if [[ ! -e devstack-gate ]]; then @@ -36,7 +36,7 @@ if [[ ! -e devstack-gate ]]; then git clone https://git.openstack.org/openstack-infra/devstack-gate else echo "Fixing devstack-gate git remotes" - cd devstack-gate || exit 404 + cd devstack-gate || exit 1 git remote set-url origin https://git.openstack.org/openstack-infra/devstack-gate git remote update git reset --hard diff --git a/jjb/neutron/include-raw-openstack-ci.sh b/jjb/neutron/include-raw-openstack-ci.sh index 7864b9629..24d43322e 100644 --- a/jjb/neutron/include-raw-openstack-ci.sh +++ b/jjb/neutron/include-raw-openstack-ci.sh @@ -17,18 +17,18 @@ sudo chown -R jenkins:jenkins /opt/stack/new sudo bash -c 'echo "stack ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers' # We need to install some scripts from openstack-infra/project-config -cd ~ || exit 404 +cd ~ || exit 1 echo "Setting up infra scripts" sudo mkdir -p /usr/local/jenkins/slave_scripts git clone https://git.openstack.org/openstack-infra/project-config -cd project-config || exit 404 +cd project-config || exit 1 sudo cp jenkins/scripts/subunit2html.py /usr/local/jenkins/slave_scripts # Save existing WORKSPACE SAVED_WORKSPACE=$WORKSPACE export WORKSPACE=~/workspace mkdir -p $WORKSPACE -cd $WORKSPACE || exit 404 +cd $WORKSPACE || exit 1 # This is the job which checks out devstack-gate if [[ ! -e devstack-gate ]]; then @@ -36,7 +36,7 @@ if [[ ! -e devstack-gate ]]; then git clone https://git.openstack.org/openstack-infra/devstack-gate else echo "Fixing devstack-gate git remotes" - cd devstack-gate || exit 404 + cd devstack-gate || exit 1 git remote set-url origin https://git.openstack.org/openstack-infra/devstack-gate git remote update git reset --hard diff --git a/jjb/opendaylight-infra-stack.sh b/jjb/opendaylight-infra-stack.sh index e54d637f9..3a1051440 100644 --- a/jjb/opendaylight-infra-stack.sh +++ b/jjb/opendaylight-infra-stack.sh @@ -6,7 +6,7 @@ pip install --upgrade pip pip install --upgrade python-openstackclient python-heatclient pip freeze -cd /builder/openstack-hot || exit 404 +cd /builder/openstack-hot || exit 1 JOB_SUM=$(echo "$JOB_NAME" | sum | awk '{{ print $1 }}') VM_NAME="$JOB_SUM-$BUILD_NUMBER" -- 2.36.6