Merge "Revert "cloud-infra: Use sudo while operating on openrc""

diff --git a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
index fd2a6b7fe7ac875e274057a2effbbaeb3e05e8d7..d52496a63a88f9aaedd11f4dc9ee2929b2627af6 100644 (file)
--- 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 bbbc5bf28ac07ccba62d335f20cca60843475feb..33447806d972787c0136539dd262664475962e74 100644 (file)
--- 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 63c3beae22d04359897a682b8b96e3d9baee58b7..b732de44601743e61042cc4e8f5f84606356845e 100644 (file)
--- a/jjb/cloud-infra/delete-heat-stack.sh
+++ b/jjb/cloud-infra/delete-heat-stack.sh
@@ -62,7 +62,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!"