diff options
Diffstat (limited to 'jjb/releng')
| -rw-r--r-- | jjb/releng/functest-docker.yml | 40 | ||||
| -rw-r--r-- | jjb/releng/opnfv-docker.yml | 13 | ||||
| -rw-r--r-- | jjb/releng/opnfv-repo-archiver.sh | 2 | ||||
| -rw-r--r-- | jjb/releng/releng-ci-jobs.yml | 20 |
4 files changed, 17 insertions, 58 deletions
diff --git a/jjb/releng/functest-docker.yml b/jjb/releng/functest-docker.yml index dff08fe58..6c131604b 100644 --- a/jjb/releng/functest-docker.yml +++ b/jjb/releng/functest-docker.yml @@ -100,47 +100,47 @@ name: 'build-base-img-create-manifest' execution-type: SEQUENTIAL projects: - - name: 'functest-core-build-push-{stream}' + - name: 'functest-core-build-push-{arch_tag}-{stream}' <<: *build-job-settings - - name: 'functest-core-create-manifest-{stream}' + - name: 'functest-core-create-manifest-{arch_tag}-{stream}' <<: *manifest-job-settings - multijob: name: 'build-child-img' condition: SUCCESSFUL execution-type: PARALLEL projects: - - name: 'functest-healthcheck-build-push-{stream}' + - name: 'functest-healthcheck-build-push-{arch_tag}-{stream}' <<: *build-job-settings - - name: 'functest-features-build-push-{stream}' + - name: 'functest-features-build-push-{arch_tag}-{stream}' <<: *build-job-settings - - name: 'functest-components-build-push-{stream}' + - name: 'functest-components-build-push-{arch_tag}-{stream}' <<: *build-job-settings - - name: 'functest-parser-build-push-{stream}' + - name: 'functest-parser-build-push-{arch_tag}-{stream}' <<: *build-job-settings - - name: 'functest-smoke-build-push-{stream}' + - name: 'functest-smoke-build-push-{arch_tag}-{stream}' <<: *build-job-settings - - name: 'functest-vnf-build-push-{stream}' + - name: 'functest-vnf-build-push-{arch_tag}-{stream}' <<: *build-job-settings - - name: 'functest-restapi-build-push-{stream}' + - name: 'functest-restapi-build-push-{arch_tag}-{stream}' <<: *build-job-settings - multijob: name: 'create-img-manifest' condition: SUCCESSFUL execution-type: PARALLEL projects: - - name: 'functest-healthcheck-create-manifest-{stream}' + - name: 'functest-healthcheck-create-manifest-{arch_tag}-{stream}' <<: *manifest-job-settings - - name: 'functest-features-create-manifest-{stream}' + - name: 'functest-features-create-manifest-{arch_tag}-{stream}' <<: *manifest-job-settings - - name: 'functest-components-create-manifest-{stream}' + - name: 'functest-components-create-manifest-{arch_tag}-{stream}' <<: *manifest-job-settings - - name: 'functest-parser-create-manifest-{stream}' + - name: 'functest-parser-create-manifest-{arch_tag}-{stream}' <<: *manifest-job-settings - - name: 'functest-smoke-create-manifest-{stream}' + - name: 'functest-smoke-create-manifest-{arch_tag}-{stream}' <<: *manifest-job-settings - - name: 'functest-vnf-create-manifest-{stream}' + - name: 'functest-vnf-create-manifest-{arch_tag}-{stream}' <<: *manifest-job-settings - - name: 'functest-restapi-create-manifest-{stream}' + - name: 'functest-restapi-create-manifest-{arch_tag}-{stream}' <<: *manifest-job-settings publishers: @@ -170,10 +170,6 @@ scm: - git-scm - triggers: - - pollscm: - cron: "*/30 * * * *" - publishers: - 'functest-{arch_tag}-recipients' @@ -209,10 +205,6 @@ scm: - git-scm - triggers: - - pollscm: - cron: "*/30 * * * *" - publishers: - 'functest-{arch_tag}-recipients' diff --git a/jjb/releng/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml index 862e77ac8..8250bfea4 100644 --- a/jjb/releng/opnfv-docker.yml +++ b/jjb/releng/opnfv-docker.yml @@ -19,11 +19,6 @@ stream: euphrates branch: 'stable/{stream}' disabled: false - functest-receivers: &functest-receivers - receivers: > - jalausuch@suse.com morgan.richomme@orange.com - cedric.ollivier@orange.com feng.xiaowei@zte.com.cn - juha.kosonen@nokia.com wangwulin@huawei.com storperf-receivers: &storperf-receivers receivers: > mark.beierl@emc.com @@ -56,10 +51,6 @@ project: 'dovetail' <<: *master <<: *other-receivers - - 'functest': - project: 'functest' - <<: *master - <<: *functest-receivers - 'nfvbench': project: 'nfvbench' <<: *master @@ -116,10 +107,6 @@ project: 'bottlenecks' <<: *euphrates <<: *other-receivers - - 'functest': - project: 'functest' - <<: *euphrates - <<: *functest-receivers - 'storperf-master': project: 'storperf' dockerdir: 'docker/storperf-master' diff --git a/jjb/releng/opnfv-repo-archiver.sh b/jjb/releng/opnfv-repo-archiver.sh index c9fdba379..2408c2a83 100644 --- a/jjb/releng/opnfv-repo-archiver.sh +++ b/jjb/releng/opnfv-repo-archiver.sh @@ -35,7 +35,7 @@ for PROJECT in "${PROJECT_LIST[@]}"; do # Don't license scan kernel or qemu in kvmfornfv if [ "$PROJECT" == "kvmfornfv" ]; then - rm -rf "$CLONE_PATH/$PROJECT/{kernel,qemu}" + rm -rf "$CLONE_PATH/$PROJECT/"{kernel,qemu} fi done diff --git a/jjb/releng/releng-ci-jobs.yml b/jjb/releng/releng-ci-jobs.yml index d4f39708e..c4b7c8db3 100644 --- a/jjb/releng/releng-ci-jobs.yml +++ b/jjb/releng/releng-ci-jobs.yml @@ -5,7 +5,6 @@ - 'releng-verify-jjb' - 'releng-merge-jjb' - 'releng-comment-jjb' - - 'releng-generate-artifacts-api' project: 'releng' @@ -119,22 +118,3 @@ cd /opt/jenkins-ci/releng git pull jenkins-jobs update -r --delete-old jjb/ - -- job-template: - name: 'releng-generate-artifacts-api' - - # Generate and upload the JSON file to used for artifacts site - - parameters: - - project-parameter: - project: '{project}' - branch: 'master' - - scm: - - git-scm - - triggers: - - timed: '@hourly' - - builders: - - build-and-upload-artifacts-json-api |