diff options
| -rw-r--r-- | jjb/apex/apex.yml | 2 | ||||
| -rw-r--r-- | jjb/apex/apex.yml.j2 | 2 | ||||
| -rw-r--r-- | jjb/armband/armband-ci-jobs.yml | 2 | ||||
| -rwxr-xr-x | jjb/daisy4nfv/daisy4nfv-upload-artifact.sh | 2 | ||||
| -rw-r--r-- | jjb/kvmfornfv/kvmfornfv.yml | 2 | ||||
| -rw-r--r-- | jjb/releng/opnfv-docker-custom.yml | 122 | ||||
| -rw-r--r-- | jjb/releng/opnfv-docs.yml | 6 |
7 files changed, 70 insertions, 68 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 2e1159213..4ec6efbd4 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -1327,7 +1327,7 @@ - 'apex-run.*' triggers: - - timed: '' #'0 1 * * *' + - timed: '' # '0 1 * * *' builders: - description-setter: diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2 index d49b6eaf9..31415499c 100644 --- a/jjb/apex/apex.yml.j2 +++ b/jjb/apex/apex.yml.j2 @@ -1195,7 +1195,7 @@ - 'apex-run.*' triggers: - - timed: '' #'0 1 * * *' + - timed: '' # '0 1 * * *' builders: - description-setter: diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml index f8ed35283..1aa9df619 100644 --- a/jjb/armband/armband-ci-jobs.yml +++ b/jjb/armband/armband-ci-jobs.yml @@ -36,6 +36,7 @@ # euphrates # ------------------------------- pod: + # yamllint disable rule:key-duplicates - armband-baremetal: <<: *baremetal <<: *euphrates @@ -51,6 +52,7 @@ - armband-virtual: <<: *virtual <<: *master + # yamllint enable rule:key-duplicates # ------------------------------- # scenarios # ------------------------------- diff --git a/jjb/daisy4nfv/daisy4nfv-upload-artifact.sh b/jjb/daisy4nfv/daisy4nfv-upload-artifact.sh index 27bb8de23..def4f6a75 100755 --- a/jjb/daisy4nfv/daisy4nfv-upload-artifact.sh +++ b/jjb/daisy4nfv/daisy4nfv-upload-artifact.sh @@ -51,7 +51,7 @@ cd $WORKSPACE gsutil cp $BUILD_DIRECTORY/opnfv-$OPNFV_ARTIFACT_VERSION.bin \ gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.bin > gsutil.bin.log 2>&1 gsutil cp $BUILD_DIRECTORY/opnfv-$OPNFV_ARTIFACT_VERSION.iso \ - gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.bin >> gsutil.bin.log 2>&1 + gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso >> gsutil.bin.log 2>&1 gsutil cp $WORKSPACE/opnfv.properties \ gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.properties > gsutil.properties.log 2>&1 if [[ ! "$JOB_NAME" =~ (verify|merge) ]]; then diff --git a/jjb/kvmfornfv/kvmfornfv.yml b/jjb/kvmfornfv/kvmfornfv.yml index 2e542acea..ad497e97d 100644 --- a/jjb/kvmfornfv/kvmfornfv.yml +++ b/jjb/kvmfornfv/kvmfornfv.yml @@ -12,7 +12,7 @@ - euphrates: branch: 'stable/{stream}' gs-pathname: '/{stream}' - disabled: false + disabled: true ##################################### # patch verification phases ##################################### diff --git a/jjb/releng/opnfv-docker-custom.yml b/jjb/releng/opnfv-docker-custom.yml index 3e4a40d13..e564ab5ef 100644 --- a/jjb/releng/opnfv-docker-custom.yml +++ b/jjb/releng/opnfv-docker-custom.yml @@ -1,3 +1,4 @@ +--- ######################## # Job configuration for opnfv-docker-custom ######################## @@ -8,18 +9,18 @@ project: '{name}' jobs: - - 'opnfv-docker-custom-verify-{stream}' - - 'opnfv-docker-custom-merge-{stream}' + - 'opnfv-docker-custom-verify-{stream}' + - 'opnfv-docker-custom-merge-{stream}' stream: - - master: - branch: '{stream}' - gs-pathname: '' - disabled: false - - danube: - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - disabled: false + - master: + branch: '{stream}' + gs-pathname: '' + disabled: false + - danube: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false ######################## # job templates @@ -31,38 +32,38 @@ disabled: '{obj:disabled}' parameters: - - project-parameter: - project: $GERRIT_PROJECT - branch: '{branch}' + - project-parameter: + project: $GERRIT_PROJECT + branch: '{branch}' scm: - - git-scm-gerrit + - git-scm-gerrit triggers: - - gerrit: - server-name: 'gerrit.opnfv.org' - 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: 'recheck' - - comment-added-contains-event: - comment-contains-value: 'reverify' - projects: - - project-compare-type: 'REG_EXP' - project-pattern: 'disabled' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - file-paths: - - compare-type: ANT - pattern: 'docker/**' + - gerrit: + server-name: 'gerrit.opnfv.org' + 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: 'recheck' + - comment-added-contains-event: + comment-contains-value: 'reverify' + projects: + - project-compare-type: 'REG_EXP' + project-pattern: 'disabled' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + file-paths: + - compare-type: ANT + pattern: 'docker/**' builders: - - verify-docker + - verify-docker - job-template: name: 'opnfv-docker-custom-merge-{stream}' @@ -70,42 +71,41 @@ disabled: '{obj:disabled}' parameters: - - project-parameter: - project: $GERRIT_PROJECT - branch: '{branch}' + - project-parameter: + project: $GERRIT_PROJECT + branch: '{branch}' scm: - - git-scm + - git-scm triggers: - - gerrit: - server-name: 'gerrit.opnfv.org' - trigger-on: - - change-merged-event - - comment-added-contains-event: - comment-contains-value: 'remerge' - projects: - - project-compare-type: 'REG_EXP' - project-pattern: 'disabled' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - file-paths: - - compare-type: ANT - pattern: 'docker/**' + - gerrit: + server-name: 'gerrit.opnfv.org' + trigger-on: + - change-merged-event + - comment-added-contains-event: + comment-contains-value: 'remerge' + projects: + - project-compare-type: 'REG_EXP' + project-pattern: 'disabled' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + file-paths: + - compare-type: ANT + pattern: 'docker/**' builders: - - merge-docker + - merge-docker - builder: name: verify-docker builders: - - shell: | - /bin/bash $WORKSPACE/verify-docker.sh + - shell: | + /bin/bash $WORKSPACE/verify-docker.sh - builder: name: merge-docker builders: - - shell: | - /bin/bash $WORKSPACE/merge-docker.sh - + - shell: | + /bin/bash $WORKSPACE/merge-docker.sh diff --git a/jjb/releng/opnfv-docs.yml b/jjb/releng/opnfv-docs.yml index afe8523f2..740274518 100644 --- a/jjb/releng/opnfv-docs.yml +++ b/jjb/releng/opnfv-docs.yml @@ -18,11 +18,11 @@ doc-version: '' gs-pathname: '' disabled: false - - danube: + - euphrates: branch: 'stable/{stream}' - doc-version: '3.0' + doc-version: '5.0.0' gs-pathname: '/{stream}/{doc-version}' - disabled: true + disabled: false ######################## # job templates |