Merge "[Dovetail] Increase frequency of Dovetail runs on Apex"

diff --git a/jjb-sandbox/releng/releng-sandbox-jobs.yml b/jjb-sandbox/releng/releng-sandbox-jobs.yml
deleted file mode 100644 (file)
index df8b1d5..0000000
--- a/jjb-sandbox/releng/releng-sandbox-jobs.yml
+++ /dev/null
@@ -1,61 +0,0 @@
----
-- project:
-    name: 'releng-sandbox-jobs'
-    jobs:
-      - 'releng-deploy-sandbox'
-
-    project: 'releng'
-    node: 'releng-sandbox'
-
-- job-template:
-    name: 'releng-deploy-sandbox'
-    node: '{node}'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: 'master'
-    scm:
-      - git-scm-gerrit
-
-    triggers:
-      - gerrit:
-          trigger-on:
-            - patchset-created-event:
-                exclude-drafts: 'false'
-                exclude-trivial-rebase: 'false'
-                exclude-no-code-change: 'false'
-            - draft-published-event
-            - comment-added-contains-event:
-                comment-contains-value: 'redeploy'
-          custom-url: '$BUILD_URL deploying to $JENKINS_URL'
-          silent-start: true
-          skip-vote:
-            successful: true
-            failed: true
-            unstable: true
-            notbuilt: true
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: 'releng'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/master'
-              file-paths:
-                - compare-type: ANT
-                  pattern: jjb-sandbox/**
-
-    wrappers: ''
-
-    builders:
-      - shell:
-          !include-raw-escape: verify-sandbox-jobs.sh
-      # yamllint disable rule:line-length
-      - shell: |
-          #!/bin/bash
-          jenkins-jobs update --delete-old -r jjb/releng-defaults.yaml:jjb/releng-macros.yaml:jjb/opnfv/installer-params.yml:jjb/opnfv/slave-params.yml:jjb-sandbox
-      # yamllint enable
-    publishers:
-      - archive-artifacts:
-          artifacts: 'job_output/*'
-      - email-jenkins-admins-on-failure

diff --git a/jjb-sandbox/releng/verify-sandbox-jobs.sh b/jjb-sandbox/releng/verify-sandbox-jobs.sh
deleted file mode 100755 (executable)
index 5990161..0000000
--- a/jjb-sandbox/releng/verify-sandbox-jobs.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-# SPDX-license-identifier: Apache-2.0
-##############################################################################
-# Copyright (c) 2016 Linux Foundation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-#test for non-ascii characters, these can pass the test and end up breaking things in production
-for x in $(find . -name *\.yml); do
-
-  if LC_ALL=C grep -q '[^[:print:][:space:]]' "$x"; then
-    echo "file "$x" contains non-ascii characters"
-    exit 1
-  fi
-
-done
-
-jenkins-jobs test -r jjb/releng-defaults.yaml:jjb/releng-macros.yaml:jjb/opnfv/installer-params.yml:jjb/opnfv/slave-params.yml:jjb-sandbox \
-    -o job_output

diff --git a/jjb/auto/auto.yaml b/jjb/auto/auto.yaml
index d70b204..0cfe88f 100644 (file)
--- a/jjb/auto/auto.yaml
+++ b/jjb/auto/auto.yaml
@@ -101,9 +101,9 @@
       - trigger-builds:
           - project: '{installer}-deploy-{pod}-daily-{stream}'
             current-parameters: false
-            predefined-parameters:
-              DEPLOY_SCENARIO='os-nosdn-nofeature-ha'
-              PROJECT='armband'
+            predefined-parameters: |
+              DEPLOY_SCENARIO=os-nosdn-nofeature-ha
+              PROJECT=armband
             same-node: true
             block: true
 

diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
index 24a28c6..4340a0c 100755 (executable)
--- a/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@ -69,8 +69,6 @@ run_test() {
             FUNCTEST_IMAGE=${REPO}/functest-vnf:${DOCKER_TAG} ;;
         promise|doctor-notification|bgpvpn|functest-odl-sfc|domino-multinode|barometercollectd|fds)
             FUNCTEST_IMAGE=${REPO}/functest-features:${DOCKER_TAG} ;;
-        parser-basics)
-            FUNCTEST_IMAGE=${REPO}/functest-parser:${DOCKER_TAG} ;;
         *)
             echo "Unkown test case $test_name"
             exit 1
@@ -169,9 +167,9 @@ elif [ ${FUNCTEST_MODE} == 'tier' ]; then
     run_tiers ${tiers}
 else
     if [ ${DEPLOY_TYPE} == 'baremetal' ] && [ "${HOST_ARCH}" != "aarch64" ]; then
-        tiers=(healthcheck smoke features vnf parser)
+        tiers=(healthcheck smoke features vnf)
     else
-        tiers=(healthcheck smoke features parser)
+        tiers=(healthcheck smoke features)
     fi
     run_tiers ${tiers}
 fi

diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml
index 50c7c38..f7cf2d2 100644 (file)
--- a/jjb/functest/functest-docker.yaml
+++ b/jjb/functest/functest-docker.yaml
@@ -32,6 +32,10 @@
       - 'smoke'
       - 'vnf'
 
+    exclude:
+      - stream: 'master'
+        image: 'parser'
+
     # settings for jobs run in multijob phases
     build-job-settings: &build-job-settings
       current-parameters: false

diff --git a/jjb/releng/opnfv-repo-archiver.sh b/jjb/releng/opnfv-repo-archiver.sh
index 6fa0aef..b7ff3ba 100644 (file)
--- a/jjb/releng/opnfv-repo-archiver.sh
+++ b/jjb/releng/opnfv-repo-archiver.sh
@@ -29,7 +29,7 @@ for PROJECT in "${PROJECT_LIST[@]}"; do
     git clone "https://gerrit.opnfv.org/gerrit/$PROJECT.git" $CLONE_PATH/$PROJECT
   else
     pushd "$CLONE_PATH/$PROJECT" &>/dev/null
-    git pull -f
+    git pull -f origin master
     popd &> /dev/null
   fi