diff options
Diffstat (limited to 'jjb')
-rw-r--r-- | jjb/apex/apex.yml | 4 | ||||
-rw-r--r-- | jjb/apex/apex.yml.j2 | 4 | ||||
-rw-r--r-- | jjb/armband/armband-verify-jobs.yml | 2 | ||||
-rw-r--r-- | jjb/daisy4nfv/daisy-project-jobs.yml | 2 | ||||
-rw-r--r-- | jjb/daisy4nfv/daisy4nfv-merge-jobs.yml | 1 | ||||
-rw-r--r-- | jjb/daisy4nfv/daisy4nfv-verify-jobs.yml | 5 | ||||
-rw-r--r-- | jjb/fuel/fuel-verify-jobs.yml | 2 | ||||
-rw-r--r-- | jjb/functest/functest-alpine.sh | 2 |
8 files changed, 17 insertions, 5 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 92651e85c..9ccf8e39d 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -231,11 +231,15 @@ - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' disable-strict-forbidden-file-verification: 'true' + file-paths: + - compare-type: ANT + pattern: '**' forbidden-file-paths: - compare-type: ANT pattern: 'apex/tests/**' - compare-type: ANT pattern: 'docs/**' + properties: - logrotate-default - build-blocker: diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2 index 960839ad2..c878fe6af 100644 --- a/jjb/apex/apex.yml.j2 +++ b/jjb/apex/apex.yml.j2 @@ -143,11 +143,15 @@ - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' disable-strict-forbidden-file-verification: 'true' + file-paths: + - compare-type: ANT + pattern: '**' forbidden-file-paths: - compare-type: ANT pattern: 'apex/tests/**' - compare-type: ANT pattern: 'docs/**' + properties: - logrotate-default - build-blocker: diff --git a/jjb/armband/armband-verify-jobs.yml b/jjb/armband/armband-verify-jobs.yml index b18d9f71e..c43dc7f82 100644 --- a/jjb/armband/armband-verify-jobs.yml +++ b/jjb/armband/armband-verify-jobs.yml @@ -208,7 +208,7 @@ name: 'armband-verify-deploy-virtual-macro' builders: - shell: - !include-raw-escape: ../fuel/fuel-deploy.sh + !include-raw: ../fuel/fuel-deploy.sh - builder: name: 'armband-verify-smoke-test-macro' diff --git a/jjb/daisy4nfv/daisy-project-jobs.yml b/jjb/daisy4nfv/daisy-project-jobs.yml index fd0da7928..09b0bc2e1 100644 --- a/jjb/daisy4nfv/daisy-project-jobs.yml +++ b/jjb/daisy4nfv/daisy-project-jobs.yml @@ -54,6 +54,8 @@ use-build-blocker: true blocking-jobs: - '{installer}-daily-.*' + - 'daisy4nfv-merge-build-.*' + - 'daisy4nfv-verify-build-.*' block-level: 'NODE' scm: diff --git a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml index 561ffbe24..f7a6c1363 100644 --- a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml +++ b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml @@ -154,6 +154,7 @@ use-build-blocker: true blocking-jobs: - '{alias}-merge-{phase}-.*' + - '{installer}-daily-.*' block-level: 'NODE' scm: diff --git a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml index dff0ff0a4..6f6ab0fb0 100644 --- a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml +++ b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml @@ -50,7 +50,7 @@ - build-blocker: use-build-blocker: true blocking-jobs: - - '{installer}-merge-build-.*' + - '{alias}-merge-build-.*' block-level: 'NODE' scm: @@ -147,8 +147,9 @@ - build-blocker: use-build-blocker: true blocking-jobs: - - '{installer}-merge-build-.*' + - '{alias}-merge-build-.*' - '{alias}-verify-build-.*' + - '{installer}-daily-.*' block-level: 'NODE' scm: diff --git a/jjb/fuel/fuel-verify-jobs.yml b/jjb/fuel/fuel-verify-jobs.yml index f5840bcab..45197fc4e 100644 --- a/jjb/fuel/fuel-verify-jobs.yml +++ b/jjb/fuel/fuel-verify-jobs.yml @@ -208,7 +208,7 @@ name: 'fuel-verify-deploy-virtual-macro' builders: - shell: - !include-raw-escape: ./fuel-deploy.sh + !include-raw: ./fuel-deploy.sh - builder: name: 'fuel-verify-smoke-test-macro' diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index f0e08e171..cee302699 100644 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -70,7 +70,7 @@ set +e tiers=(healthcheck smoke features vnf) for tier in ${tiers[@]}; do - FUNCTEST_IMAGE=ollivier/functest-${tier} + FUNCTEST_IMAGE=opnfv/functest-${tier} echo "Functest: Pulling Functest Docker image ${FUNCTEST_IMAGE} ..." docker pull ${FUNCTEST_IMAGE}>/dev/null cmd="docker run ${envs} ${volumes} ${FUNCTEST_IMAGE}" |