Merge "[validation] Build release images"

diff --git a/jjb/akraino-templates/akraino-icn-templates.yaml b/jjb/akraino-templates/akraino-icn-templates.yaml
deleted file mode 100644 (file)
index 8e3c665..0000000
--- a/jjb/akraino-templates/akraino-icn-templates.yaml
+++ /dev/null
@@ -1,96 +0,0 @@
----
-#
-## Copyright (c) 2019 Intel Corporation
-##
-## Licensed under the Apache License, Version 2.0 (the "License"); you may
-## not use this file except in compliance with the License.
-##
-## You may obtain a copy of the License at
-##       http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-## WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-#
-- job-template:
-    id: akraino-project-stream-verify-gate
-    name: '{project-name}-{stream}-verify-{gate}'
-    archive-artifacts: >
-      **/*.log
-    build-days-to-keep: 30
-    build-timeout: 60
-    stream: master
-    gate: bashate
-    project-type: freestyle
-    submodule-recursive: true
-    node: '{build-node}'
-
-    properties:
-      - lf-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - lf-infra-parameters:
-          project: '{project}'
-          stream: '{stream}'
-          branch: '{branch}'
-          lftools-version: '{lftools-version}'
-
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
-
-    wrappers:
-      - lf-infra-wrappers:
-          build-timeout: '{build-timeout}'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-
-    scm:
-      - lf-infra-gerrit-scm:
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-          git-url: '{git-url}/{project}.git'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '$GERRIT_BRANCH'
-          submodule-recursive: '{submodule-recursive}'
-          submodule-timeout: '{submodule-timeout}'
-          submodule-disable: false
-          choosing-strategy: 'gerrit'
-
-    triggers:
-      - gerrit:
-          server-name: '{gerrit-server-name}'
-          trigger-on:
-            - patchset-created-event:
-                exclude-drafts: 'false'
-                exclude-trivial-rebase: 'false'
-                exclude-no-code-change: 'false'
-            - change-merged-event
-            - draft-published-event
-            - comment-added-contains-event:
-                comment-contains-value: 'recheck'
-            - comment-added-contains-event:
-                comment-contains-value: 'reverify'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: '{project}'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
-              file-paths:
-                - compare-type: ANT
-                  pattern: '**/*'
-              disable-strict-forbidden-file-verification: 'true'
-              forbidden-file-paths:
-                - compare-type: ANT
-                  pattern: 'docs/**'
-          readable-message: true
-
-    builders:
-      - shell: 'make {gate}'
-
-    publishers:
-      - lf-infra-publish

diff --git a/jjb/icn/icn.yaml b/jjb/icn/icn.yaml
index 3e6e685..2aa91bc 100644 (file)
--- a/jjb/icn/icn.yaml
+++ b/jjb/icn/icn.yaml
@@ -19,11 +19,11 @@
     name: icn
     project: icn
     project-name: icn
-    gate:
-      - bashate
     build-node: icn-dev
     stream:
       - master:
           branch: master
     jobs:
-      - akraino-project-stream-verify-gate
+      - akraino-project-stream-verify
+    views:
+      - project-view

diff --git a/jjb/shell/run_bluval.sh b/jjb/shell/run_bluval.sh
index 5f0c4db..5870ed9 100755 (executable)
--- a/jjb/shell/run_bluval.sh
+++ b/jjb/shell/run_bluval.sh
@@ -14,6 +14,12 @@ set -o pipefail
 cwd=$(pwd)
 is_optional="false"
 
+finish() {
+    # Fix ownership of output files
+    user_id=$(stat -c '%u:%g' $cwd)
+    sudo chown -R ${user_id} $results_dir
+}
+
 info ()  {
     logger -s -t "run_blu_val.info" "$*"
 }
@@ -112,6 +118,8 @@ then
     fi
 fi
 
+trap finish EXIT
+
 if [ ! -d "$cwd/validation" ]
 then
     git clone http://gerrit.akraino.org/r/validation