X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fpackaging%2Fpackaging-macros.yaml;h=ae1e2573bb509ca6015c8adadf2ca731a9104da9;hb=9477a94eed604f9989cd61659491e5339708a088;hp=568f942239313c766fb585e7d2d004cceceda75f;hpb=ebe737ff767751b562b36673d94a568dfc361341;p=releng%2Fbuilder.git

diff --git a/jjb/packaging/packaging-macros.yaml b/jjb/packaging/packaging-macros.yaml
index 568f94223..ae1e2573b 100644
--- a/jjb/packaging/packaging-macros.yaml
+++ b/jjb/packaging/packaging-macros.yaml
@@ -1,5 +1,74 @@
 # Integration/Packaging macros
 ---
+- builder:
+    name: install-rpm
+    builders:
+      - shell: !include-raw: install-rpm.sh
+
+- builder:
+    name: install-repo-cfg-rpm
+    builders:
+      - shell: |
+          # shellcheck disable=SC2154
+          repo_file="${REPO_CFG_FILE_URL##*/}"
+          sudo curl -s -o /etc/yum.repos.d/"$repo_file" "$REPO_CFG_FILE_URL"
+
+- builder:
+    name: start-odl
+    builders:
+      - shell: !include-raw: start-odl.sh
+
+- builder:
+    name: test-odl
+    builders:
+      - shell: |
+          # Install expect to interact with Karaf shell
+          # Install nmap to check status of ODL's SSH port
+          sudo yum install -y expect nmap
+      - shell: !include-raw: test-ports-nofeature.sh
+      - shell: !include-raw: test-karaf-oxygensafe.expect
+      # Disable this test until ODLPARENT-139 is fixed
+      # - shell: !include-raw: test-rest-ok.sh
+
+- builder:
+    name: stop-odl
+    builders:
+      - shell: !include-raw: stop-odl.sh
+
+- builder:
+    name: uninstall-rpm
+    builders:
+      - shell: !include-raw: uninstall-rpm.sh
+
+- builder:
+    name: upgrade-odl
+    builders:
+      - shell: |
+          sudo yum upgrade -y opendaylight
+
+- builder:
+    name: install-start-test-stop-rpm
+    builders:
+      - install-rpm
+      - start-odl
+      - test-odl
+      - stop-odl
+
+- builder:
+    name: install-start-test-stop-uninstall-rpm
+    builders:
+      - install-start-test-stop-rpm
+      - uninstall-rpm
+
+- builder:
+    name: installrepcfg-upgrade-start-test-stop-rpm
+    builders:
+      - install-repo-cfg-rpm
+      - upgrade-odl
+      - start-odl
+      - test-odl
+      - stop-odl
+
 - builder:
     name: install-test-uninstall-rpm
     builders:
@@ -20,8 +89,9 @@
       - 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 || echo "No known_hosts file"
+          # Remove old host key (if exists) so future installs don't fail SSH
+          rm /home/jenkins/.ssh/known_hosts || \
+            echo "No known_hosts file to clean up, which is fine"
 
 - builder:
     name: install-test-uninstall-deb
@@ -43,5 +113,6 @@
       - shell: !include-raw: stop-odl.sh
       - shell: !include-raw: uninstall-deb.sh
       - shell: |
-          # Remove old host key so future installs don't fail to SSH
-          rm /home/jenkins/.ssh/known_hosts || echo "No known_hosts file"
+          # Remove old host key (if exists) so future installs don't fail SSH
+          rm /home/jenkins/.ssh/known_hosts || \
+            echo "No known_hosts file to clean up, which is fine"