X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-kubernetes-project-jobs.yaml;h=178df6a9e93155477bcf77f6324af206252414c2;hb=7d251e861b54f1a9d9ab192c7c65e5a810541e43;hp=46b77ce6881347b6e7046c13ea2e0650c2b5a5da;hpb=dbbec4abb146567d81f4af96a66690fa53f5e1fa;p=releng.git

diff --git a/jjb/functest/functest-kubernetes-project-jobs.yaml b/jjb/functest/functest-kubernetes-project-jobs.yaml
index 46b77ce68..178df6a9e 100644
--- a/jjb/functest/functest-kubernetes-project-jobs.yaml
+++ b/jjb/functest/functest-kubernetes-project-jobs.yaml
@@ -11,22 +11,17 @@
     jobs:
       - 'functest-kubernetes-verify-{stream}'
       - 'functest-kubernetes-verify-{phase}-{stream}'
-      - 'functest-kubernetes-docs-upload-{stream}'
 
     stream:
       - master:
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
-      - hunter: &hunter
+      - iruya: &iruya
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false
-      - gambia: &gambia
-          branch: 'stable/{stream}'
-          gs-pathname: '/{stream}'
-          disabled: false
-      - fraser: &fraser
+      - hunter: &hunter
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false
@@ -34,10 +29,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 +72,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 +98,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 +127,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 +137,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 +161,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