From: Fatih Degirmenci Date: Fri, 29 Nov 2019 06:41:44 +0000 (+0000) Subject: Revert "cloud-infra: Use sudo while operating on openrc" X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;h=3131a534939067f0a308bb8e1f915591cd8c99d5;hp=-c;p=infra%2Fcicd.git Revert "cloud-infra: Use sudo while operating on openrc" This reverts commit 39b91e0029b36de00b546613b8cf0da33151d2a5. Change-Id: I5b9f86be9864feb8b00acde6506df246a0c19d51 --- 3131a534939067f0a308bb8e1f915591cd8c99d5 diff --git a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml index fd2a6b7f..d52496a6 100644 --- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml +++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml @@ -214,7 +214,7 @@ description: $DEPLOY_SCENARIO | $ONAP_FLAVOR - shell: | #!/bin/bash - sudo /bin/rm -rf /tmp/openrc && sudo /bin/cp -f $OPENRC_FILE /tmp/openrc + /bin/rm -rf /tmp/openrc && /bin/cp -f $OPENRC_FILE /tmp/openrc - multijob: name: Deploy ONAP using OOM condition: ALWAYS diff --git a/jjb/cloud-infra/cloud-infra-verify-engine.yaml b/jjb/cloud-infra/cloud-infra-verify-engine.yaml index bbbc5bf2..33447806 100644 --- a/jjb/cloud-infra/cloud-infra-verify-engine.yaml +++ b/jjb/cloud-infra/cloud-infra-verify-engine.yaml @@ -213,7 +213,7 @@ builders: - shell: | #!/bin/bash - sudo /bin/cp -f $OPENRC_FILE /tmp/openrc + cp $OPENRC_FILE /tmp/openrc - 'cloud-infra-determine-scenario-macro' - multijob: name: deploy diff --git a/jjb/cloud-infra/delete-heat-stack.sh b/jjb/cloud-infra/delete-heat-stack.sh index 41d522aa..872ba304 100644 --- a/jjb/cloud-infra/delete-heat-stack.sh +++ b/jjb/cloud-infra/delete-heat-stack.sh @@ -61,7 +61,7 @@ set -u pip install -q openstacksdk python-openstackclient python-heatclient echo "Info: Deleting stack $STACK_NAME" echo "-------------------------------------------------------------------------" -source /tmp/openrc && sudo /bin/rm -f /tmp/openrc +source /tmp/openrc && /bin/rm -f /tmp/openrc openstack stack delete $STACK_NAME --wait --yes echo "-------------------------------------------------------------------------" echo "Info: Stack $STACK_NAME has been deleted!"