From 0b8257d6aa93cd9a6836d7ff4d61403ce9f8451b Mon Sep 17 00:00:00 2001
From: Fatih Degirmenci <fdegir@gmail.com>
Date: Tue, 24 Mar 2020 15:03:16 +0000
Subject: [PATCH] engine: Ignore releasenotes directory

Change-Id: Idf0632bb9cb82184c2f0b393a201025bc41d8049
---
 .../engine-periodic-offline-deploy-test.yaml  | 36 ++++++++++---------
 jjb/engine/scripts/functest.sh                |  4 +--
 jjb/engine/scripts/promote.sh                 |  2 +-
 .../engine-verify-deployment-parent-jobs.yaml |  2 +-
 4 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/jjb/engine/periodic-jobs/engine-periodic-offline-deploy-test.yaml b/jjb/engine/periodic-jobs/engine-periodic-offline-deploy-test.yaml
index 5a77c400a..39c575d80 100644
--- a/jjb/engine/periodic-jobs/engine-periodic-offline-deploy-test.yaml
+++ b/jjb/engine/periodic-jobs/engine-periodic-offline-deploy-test.yaml
@@ -40,7 +40,7 @@
           provisioner-type: bifrost
           installer-type: kubespray
           slave-label: baremetal-deploy
-          yardstick-dispatcher: 'influxdb'
+          yardstick-dispatcher: 'file'
 
     environment-type:
       - offline:
@@ -95,22 +95,6 @@
           name: IDF
           default: '{idf}/${{NODE_NAME}}-idf.yml'
           description: 'IDF file to use for deployment'
-      - string:
-          name: TEST_REPO_URL
-          default: 'https://gerrit.nordix.org/infra/test.git'
-          description: 'URL to clone the test repo from'
-      - string:
-          name: TEST_FW
-          default: 'functest'
-          description: 'Test framework to use'
-      - string:
-          name: TEST_SUITE
-          default: 'smoke'
-          description: 'Test suite to run'
-      - string:
-          name: YARDSTICK_DISPATCHER
-          default: '{yardstick-dispatcher}'
-          description: 'Dispatcher to use for Yardstick reporting'
 
     properties:
       - logrotate
@@ -163,6 +147,24 @@
 
     disabled: '{obj:disabled}'
 
+    parameters:
+      - string:
+          name: TEST_REPO_URL
+          default: 'https://gerrit.nordix.org/infra/test.git'
+          description: 'URL to clone the test repo from'
+      - string:
+          name: TEST_FW
+          default: '{phase}'
+          description: 'Test framework to use'
+      - string:
+          name: TEST_SUITE
+          default: 'smoke'
+          description: 'Test suite to run'
+      - string:
+          name: YARDSTICK_DISPATCHER
+          default: '{yardstick-dispatcher}'
+          description: 'Dispatcher to use for Yardstick reporting'
+
     properties:
       - logrotate
       - throttle:
diff --git a/jjb/engine/scripts/functest.sh b/jjb/engine/scripts/functest.sh
index 8799ce931..e94201125 100755
--- a/jjb/engine/scripts/functest.sh
+++ b/jjb/engine/scripts/functest.sh
@@ -29,8 +29,8 @@ fi
 
 # NOTE (fdegir): delete unnecessary stuff to free up space on baremetal jumphost
 sudo /bin/rm -rf /tmp/$ARTIFACT_TO_DOWNLOAD ~/.ara \
-    /opt/test /opt/stack /httpboot /opt/engine/offline/binaries /opt/engine/offline/containers \
-    /opt/engine/offline/dib /opt/engine/offline/pkg /tmp/kubespray_cache > /dev/null 2>&1 || true
+    /opt/test /opt/stack /httpboot /opt/engine/offline/binaries /opt/engine/offline/dib \
+    /tmp/kubespray_cache > /dev/null 2>&1 || true
 sudo docker images -a --format {{.ID}} | xargs -n 1 sudo docker rmi -f > /dev/null 2>&1 || true
 
 echo "Info  : Cloning infra/test repository"
diff --git a/jjb/engine/scripts/promote.sh b/jjb/engine/scripts/promote.sh
index ed56c6ad4..786e84eed 100755
--- a/jjb/engine/scripts/promote.sh
+++ b/jjb/engine/scripts/promote.sh
@@ -24,7 +24,7 @@ set -o pipefail
 
 if [[ "$EXECUTION_MODE" == "offline-deployment" ]]; then
   cd /tmp
-  URL_TO_UPLOAD=$NORDIX_ARM_HTTPS_URL/$NORDIX_ARM_REPO/installer/oss/$ARTIFACT_ARM_FOLDER/latest
+  URL_TO_UPLOAD=$NORDIX_ARM_HTTPS_URL/$NORDIX_ARM_REPO/installer/oss/release/latest
   for ARTIFACT_TO_UPLOAD in $ARTIFACTS_TO_UPLOAD; do
     echo "Info  : Generating checksums for $ARTIFACT_TO_UPLOAD"
     ARTIFACT_MD5SUM=$(md5sum $ARTIFACT_TO_UPLOAD | cut -d' ' -f1)
diff --git a/jjb/engine/verify-jobs/engine-verify-deployment-parent-jobs.yaml b/jjb/engine/verify-jobs/engine-verify-deployment-parent-jobs.yaml
index 3121a3d6f..37fc4747c 100644
--- a/jjb/engine/verify-jobs/engine-verify-deployment-parent-jobs.yaml
+++ b/jjb/engine/verify-jobs/engine-verify-deployment-parent-jobs.yaml
@@ -163,7 +163,7 @@
               disable-strict-forbidden-file-verification: 'true'
               forbidden-file-paths:
                 - compare-type: ANT
-                  pattern: 'docs/**'
+                  pattern: 'docs/**|releasenotes/**'
           skip-vote:
             successful: '{obj:successful}'
             failed: '{obj:failed}'
-- 
2.25.1