summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/apex/apex.yml2
-rw-r--r--jjb/functest/functest-ci-jobs.yml8
2 files changed, 7 insertions, 3 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 0356ddab3..1296b5b37 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -736,7 +736,7 @@
set -o pipefail
# delete everything that is in $WORKSPACE
- /bin/rm -rf $WORKSPACE
+ sudo /bin/rm -rf $WORKSPACE
- builder:
name: 'apex-upload-artifact'
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index b7a75e836..a0a1326ba 100644
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -260,8 +260,12 @@
fi
INSTALLER_IP=$(/usr/sbin/arp -e | grep ${instack_mac} | awk {'print $1'})
sshkey="-v /root/.ssh/id_rsa:/root/.ssh/id_rsa"
- sudo iptables -D FORWARD -o virbr0 -j REJECT --reject-with icmp-port-unreachable
- sudo iptables -D FORWARD -i virbr0 -j REJECT --reject-with icmp-port-unreachable
+ if sudo iptables -C FORWARD -o virbr0 -j REJECT --reject-with icmp-port-unreachable 2> ${redirect}; then
+ sudo iptables -D FORWARD -o virbr0 -j REJECT --reject-with icmp-port-unreachable
+ fi
+ if sudo iptables -C FORWARD -i virbr0 -j REJECT --reject-with icmp-port-unreachable 2> ${redirect}; then
+ sudo iptables -D FORWARD -i virbr0 -j REJECT --reject-with icmp-port-unreachable
+ fi
elif [[ ${INSTALLER_TYPE} == 'joid' ]]; then
# If production lab then creds may be retrieved dynamically
# creds are on the jumphost, always in the same folder