Code Review
/
releng
/
builder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove the temporary git fetch
[releng/builder.git]
/
jjb
/
packaging
/
packaging-macros.yaml
diff --git
a/jjb/packaging/packaging-macros.yaml
b/jjb/packaging/packaging-macros.yaml
index 345cfa721b319f9f81da6dff0dceccc5ee83bbc5..5abfaf2ad2864a6acbe6386b5494d5307276df5d 100644
(file)
--- a/
jjb/packaging/packaging-macros.yaml
+++ b/
jjb/packaging/packaging-macros.yaml
@@
-11,13
+11,14
@@
# Install nmap to check status of ODL's SSH port
sudo yum install -y expect nmap
- shell: !include-raw: test-rpm-deps.sh
# Install nmap to check status of ODL's SSH port
sudo yum install -y expect nmap
- shell: !include-raw: test-rpm-deps.sh
- - shell: !include-raw
-escape
: install-rpm.sh
+ - shell: !include-raw: install-rpm.sh
- shell: !include-raw: start-odl.sh
- shell: !include-raw: test-ports-nofeature.sh
- shell: !include-raw: start-odl.sh
- shell: !include-raw: test-ports-nofeature.sh
- - shell: !include-raw: test-karaf.expect
- - shell: !include-raw: test-rest-ok.sh
+ - shell: !include-raw: test-karaf-oxygensafe.expect
+ # Disable this test until ODLPARENT-139 is fixed
+ # - shell: !include-raw: test-rest-ok.sh
- shell: !include-raw: stop-odl.sh
- shell: !include-raw: uninstall-rpm.sh
- shell: |
# Remove old host key so future installs don't fail to SSH
- shell: !include-raw: stop-odl.sh
- shell: !include-raw: uninstall-rpm.sh
- shell: |
# Remove old host key so future installs don't fail to SSH
- rm /home/jenkins/.ssh/known_hosts
+ rm /home/jenkins/.ssh/known_hosts
|| echo "No known_hosts file"