summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2019-04-21 19:09:46 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2019-04-21 19:22:58 +0200
commit4d5d6323801d58ecc338f6209581e15845c47a31 (patch)
tree89361df3aa206fd6482654bcc0ad1c1e033559ad
parent93928495947d2463bc0bc19ca85592513271f011 (diff)
Remove common Releng jobs useless in case of Functest
It has to be removed as arm64 build servers are down. Then these useless jobs block all verifications. Functest docs are built online which manage branches and versions. It removes that falsy duplicate docs (only master). Change-Id: Ie6df6d8035a3899e928fd75778b68246de617445 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--jjb/functest/functest-kubernetes-project-jobs.yaml98
-rw-r--r--jjb/functest/functest-project-jobs.yaml74
-rw-r--r--jjb/functest/xtesting-project-jobs.yaml98
3 files changed, 0 insertions, 270 deletions
diff --git a/jjb/functest/functest-kubernetes-project-jobs.yaml b/jjb/functest/functest-kubernetes-project-jobs.yaml
index 7fd2525c1..161469bce 100644
--- a/jjb/functest/functest-kubernetes-project-jobs.yaml
+++ b/jjb/functest/functest-kubernetes-project-jobs.yaml
@@ -11,7 +11,6 @@
jobs:
- 'functest-kubernetes-verify-{stream}'
- 'functest-kubernetes-verify-{phase}-{stream}'
- - 'functest-kubernetes-docs-upload-{stream}'
stream:
- master:
@@ -34,10 +33,6 @@
phase:
- 'unit-tests-and-docs':
slave-label: 'opnfv-build-ubuntu'
- - 'build-x86_64':
- slave-label: 'opnfv-build-ubuntu'
- - 'build-aarch64':
- slave-label: 'opnfv-build-ubuntu-arm'
- job-template:
name: 'functest-kubernetes-verify-{stream}'
@@ -81,30 +76,6 @@
node-parameters: false
kill-phase-on: FAILURE
abort-all-job: false
- - name: 'functest-kubernetes-verify-build-x86_64-{stream}'
- current-parameters: false
- predefined-parameters: |
- GERRIT_BRANCH=$GERRIT_BRANCH
- GERRIT_REFSPEC=$GERRIT_REFSPEC
- GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
- GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
- ARCH=x86_64
- git-revision: true
- node-parameters: false
- kill-phase-on: FAILURE
- abort-all-job: false
- - name: 'functest-kubernetes-verify-build-aarch64-{stream}'
- current-parameters: false
- predefined-parameters: |
- GERRIT_BRANCH=$GERRIT_BRANCH
- GERRIT_REFSPEC=$GERRIT_REFSPEC
- GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
- GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
- ARCH=aarch64
- git-revision: true
- node-parameters: false
- kill-phase-on: FAILURE
- abort-all-job: false
- job-template:
name: 'functest-kubernetes-verify-{phase}-{stream}'
@@ -131,28 +102,6 @@
publishers:
- 'functest-kubernetes-verify-{phase}-publishers-macro'
-- job-template:
- name: 'functest-kubernetes-docs-upload-{stream}'
-
- disabled: '{obj:disabled}'
-
- parameters:
- - project-parameter:
- project: '{project}'
- branch: '{branch}'
- - 'opnfv-build-ubuntu-defaults'
-
- scm:
- - git-scm
-
- triggers:
- - 'functest-kubernetes-docs-upload-triggers-macro':
- project: '{project}'
- branch: '{branch}'
-
- builders:
- - functest-kubernetes-upload-doc-artifact
-
################################
# job triggers
################################
@@ -182,25 +131,6 @@
- compare-type: ANT
pattern: 'docs/**|.gitignore'
-- trigger:
- name: 'functest-kubernetes-docs-upload-triggers-macro'
- triggers:
- - gerrit:
- server-name: 'gerrit.opnfv.org'
- trigger-on:
- - change-merged-event
- - comment-added-contains-event:
- comment-contains-value: 'remerge'
- projects:
- - project-compare-type: 'ANT'
- project-pattern: '{project}'
- branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/{branch}'
- disable-strict-forbidden-file-verification: 'true'
- forbidden-file-paths:
- - compare-type: ANT
- pattern: 'docs/**|.gitignore'
################################
# job builders
################################
@@ -211,24 +141,6 @@
- shell: |
cd $WORKSPACE && tox
-- builder:
- name: 'functest-kubernetes-verify-build-x86_64-builders-macro'
- builders:
- - shell: |
- echo "Not activated!"
-
-- builder:
- name: 'functest-kubernetes-verify-build-aarch64-builders-macro'
- builders:
- - shell: |
- echo "Not activated!"
-
-- builder:
- name: 'functest-kubernetes-upload-doc-artifact'
- builders:
- - shell: |
- cd $WORKSPACE && tox -edocs
- wget -O - https://git.opnfv.org/releng/plain/utils/upload-artifact.sh | bash -s "api/_build" "docs"
################################
# job publishers
################################
@@ -253,13 +165,3 @@
unhealthy: 40
failing: 30
- email-jenkins-admins-on-failure
-
-- publisher:
- name: 'functest-kubernetes-verify-build-x86_64-publishers-macro'
- publishers:
- - email-jenkins-admins-on-failure
-
-- publisher:
- name: 'functest-kubernetes-verify-build-aarch64-publishers-macro'
- publishers:
- - email-jenkins-admins-on-failure
diff --git a/jjb/functest/functest-project-jobs.yaml b/jjb/functest/functest-project-jobs.yaml
index b4cc8739a..405202ecd 100644
--- a/jjb/functest/functest-project-jobs.yaml
+++ b/jjb/functest/functest-project-jobs.yaml
@@ -11,7 +11,6 @@
jobs:
- 'functest-verify-{stream}'
- 'functest-verify-{phase}-{stream}'
- - 'functest-docs-upload-{stream}'
stream:
- master:
@@ -34,10 +33,6 @@
phase:
- 'unit-tests-and-docs':
slave-label: 'opnfv-build-ubuntu'
- - 'build-x86_64':
- slave-label: 'opnfv-build-ubuntu'
- - 'build-aarch64':
- slave-label: 'opnfv-build-ubuntu-arm'
- job-template:
name: 'functest-verify-{stream}'
@@ -107,28 +102,6 @@
publishers:
- 'functest-verify-{phase}-publishers-macro'
-- job-template:
- name: 'functest-docs-upload-{stream}'
-
- disabled: '{obj:disabled}'
-
- parameters:
- - project-parameter:
- project: '{project}'
- branch: '{branch}'
- - 'opnfv-build-ubuntu-defaults'
-
- scm:
- - git-scm
-
- triggers:
- - 'functest-docs-upload-triggers-macro':
- project: '{project}'
- branch: '{branch}'
-
- builders:
- - functest-upload-doc-artifact
-
################################
# job triggers
################################
@@ -158,25 +131,6 @@
- compare-type: ANT
pattern: 'docs/**|.gitignore'
-- trigger:
- name: 'functest-docs-upload-triggers-macro'
- triggers:
- - gerrit:
- server-name: 'gerrit.opnfv.org'
- trigger-on:
- - change-merged-event
- - comment-added-contains-event:
- comment-contains-value: 'remerge'
- projects:
- - project-compare-type: 'ANT'
- project-pattern: '{project}'
- branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/{branch}'
- disable-strict-forbidden-file-verification: 'true'
- forbidden-file-paths:
- - compare-type: ANT
- pattern: 'docs/**|.gitignore'
################################
# job builders
################################
@@ -187,24 +141,6 @@
- shell: |
cd $WORKSPACE && tox
-- builder:
- name: 'functest-verify-build-x86_64-builders-macro'
- builders:
- - shell: |
- echo "Not activated!"
-
-- builder:
- name: 'functest-verify-build-aarch64-builders-macro'
- builders:
- - shell: |
- echo "Not activated!"
-
-- builder:
- name: 'functest-upload-doc-artifact'
- builders:
- - shell: |
- cd $WORKSPACE && tox -edocs
- wget -O - https://git.opnfv.org/releng/plain/utils/upload-artifact.sh | bash -s "api/build" "docs"
################################
# job publishers
################################
@@ -229,13 +165,3 @@
unhealthy: 40
failing: 30
- email-jenkins-admins-on-failure
-
-- publisher:
- name: 'functest-verify-build-x86_64-publishers-macro'
- publishers:
- - email-jenkins-admins-on-failure
-
-- publisher:
- name: 'functest-verify-build-aarch64-publishers-macro'
- publishers:
- - email-jenkins-admins-on-failure
diff --git a/jjb/functest/xtesting-project-jobs.yaml b/jjb/functest/xtesting-project-jobs.yaml
index 15c376b38..830740151 100644
--- a/jjb/functest/xtesting-project-jobs.yaml
+++ b/jjb/functest/xtesting-project-jobs.yaml
@@ -11,7 +11,6 @@
jobs:
- 'xtesting-verify-{stream}'
- 'xtesting-verify-{phase}-{stream}'
- - 'xtesting-docs-upload-{stream}'
stream:
- master:
@@ -34,10 +33,6 @@
phase:
- 'unit-tests-and-docs':
slave-label: 'opnfv-build-ubuntu'
- - 'build-x86_64':
- slave-label: 'opnfv-build-ubuntu'
- - 'build-aarch64':
- slave-label: 'opnfv-build-ubuntu-arm'
- job-template:
name: 'xtesting-verify-{stream}'
@@ -81,30 +76,6 @@
node-parameters: false
kill-phase-on: FAILURE
abort-all-job: false
- - name: 'xtesting-verify-build-x86_64-{stream}'
- current-parameters: false
- predefined-parameters: |
- GERRIT_BRANCH=$GERRIT_BRANCH
- GERRIT_REFSPEC=$GERRIT_REFSPEC
- GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
- GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
- ARCH=x86_64
- git-revision: true
- node-parameters: false
- kill-phase-on: FAILURE
- abort-all-job: false
- - name: 'xtesting-verify-build-aarch64-{stream}'
- current-parameters: false
- predefined-parameters: |
- GERRIT_BRANCH=$GERRIT_BRANCH
- GERRIT_REFSPEC=$GERRIT_REFSPEC
- GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
- GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
- ARCH=aarch64
- git-revision: true
- node-parameters: false
- kill-phase-on: FAILURE
- abort-all-job: false
- job-template:
name: 'xtesting-verify-{phase}-{stream}'
@@ -131,28 +102,6 @@
publishers:
- 'xtesting-verify-{phase}-publishers-macro'
-- job-template:
- name: 'xtesting-docs-upload-{stream}'
-
- disabled: '{obj:disabled}'
-
- parameters:
- - project-parameter:
- project: '{project}'
- branch: '{branch}'
- - 'opnfv-build-ubuntu-defaults'
-
- scm:
- - git-scm
-
- triggers:
- - 'xtesting-docs-upload-triggers-macro':
- project: '{project}'
- branch: '{branch}'
-
- builders:
- - xtesting-upload-doc-artifact
-
################################
# job triggers
################################
@@ -182,25 +131,6 @@
- compare-type: ANT
pattern: 'docs/**|.gitignore'
-- trigger:
- name: 'xtesting-docs-upload-triggers-macro'
- triggers:
- - gerrit:
- server-name: 'gerrit.opnfv.org'
- trigger-on:
- - change-merged-event
- - comment-added-contains-event:
- comment-contains-value: 'remerge'
- projects:
- - project-compare-type: 'ANT'
- project-pattern: '{project}'
- branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/{branch}'
- disable-strict-forbidden-file-verification: 'true'
- forbidden-file-paths:
- - compare-type: ANT
- pattern: 'docs/**|.gitignore'
################################
# job builders
################################
@@ -211,24 +141,6 @@
- shell: |
cd $WORKSPACE && tox
-- builder:
- name: 'xtesting-verify-build-x86_64-builders-macro'
- builders:
- - shell: |
- echo "Not activated!"
-
-- builder:
- name: 'xtesting-verify-build-aarch64-builders-macro'
- builders:
- - shell: |
- echo "Not activated!"
-
-- builder:
- name: 'xtesting-upload-doc-artifact'
- builders:
- - shell: |
- cd $WORKSPACE && tox -edocs
- wget -O - https://git.opnfv.org/releng/plain/utils/upload-artifact.sh | bash -s "api/_build" "docs"
################################
# job publishers
################################
@@ -253,13 +165,3 @@
unhealthy: 40
failing: 30
- email-jenkins-admins-on-failure
-
-- publisher:
- name: 'xtesting-verify-build-x86_64-publishers-macro'
- publishers:
- - email-jenkins-admins-on-failure
-
-- publisher:
- name: 'xtesting-verify-build-aarch64-publishers-macro'
- publishers:
- - email-jenkins-admins-on-failure