Browse Source

Merge "networking-midonet: Remove mitaka jobs"

tags/before-jenkins-config-removed
Jenkins 1 year ago
parent
commit
2a2e54e2f1

+ 0
- 3
grafana/networking-midonet.yaml View File

@@ -51,10 +51,7 @@ dashboard:
51 51
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.periodic.job.periodic-tempest-dsvm-networking-midonet-ml2-full-ubuntu-xenial-ocata.FAILURE),sum(stats_counts.zuul.pipeline.periodic.job.periodic-tempest-dsvm-networking-midonet-ml2-full-ubuntu-xenial-ocata.{SUCCESS,FAILURE})),'24hours'), 'periodic-tempest-dsvm-networking-midonet-ml2-full-ubuntu-xenial-ocata')
52 52
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.periodic.job.periodic-tempest-dsvm-networking-midonet-v2-full-ubuntu-xenial-ocata.FAILURE),sum(stats_counts.zuul.pipeline.periodic.job.periodic-tempest-dsvm-networking-midonet-v2-full-ubuntu-xenial-ocata.{SUCCESS,FAILURE})),'24hours'), 'periodic-tempest-dsvm-networking-midonet-v2-full-ubuntu-xenial-ocata')
53 53
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.periodic.job.periodic-tempest-dsvm-networking-midonet-v2-ubuntu-xenial-newton.FAILURE),sum(stats_counts.zuul.pipeline.periodic.job.periodic-tempest-dsvm-networking-midonet-v2-ubuntu-xenial-newton.{SUCCESS,FAILURE})),'24hours'), 'periodic-tempest-dsvm-networking-midonet-v2-ubuntu-xenial-newton')
54
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.periodic.job.periodic-tempest-dsvm-networking-midonet-v2-ubuntu-trusty-mitaka.FAILURE),sum(stats_counts.zuul.pipeline.periodic.job.periodic-tempest-dsvm-networking-midonet-v2-ubuntu-trusty-mitaka.{SUCCESS,FAILURE})),'24hours'), 'periodic-tempest-dsvm-networking-midonet-v2-ubuntu-trusty-mitaka')
55 54
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.periodic-stable.job.periodic-networking-midonet-python27-ocata.FAILURE),sum(stats_counts.zuul.pipeline.periodic-stable.job.periodic-networking-midonet-python27-ocata.{SUCCESS,FAILURE})),'24hours'), 'periodic-networking-midonet-python27-ocata')
56 55
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.periodic-stable.job.periodic-networking-midonet-python27-newton.FAILURE),sum(stats_counts.zuul.pipeline.periodic-stable.job.periodic-networking-midonet-python27-newton.{SUCCESS,FAILURE})),'24hours'), 'periodic-networking-midonet-python27-newton')
57
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.periodic-stable.job.periodic-networking-midonet-python27-mitaka.FAILURE),sum(stats_counts.zuul.pipeline.periodic-stable.job.periodic-networking-midonet-python27-mitaka.{SUCCESS,FAILURE})),'24hours'), 'periodic-networking-midonet-python27-mitaka')
58
-            - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.periodic-stable.job.periodic-networking-midonet-docs-mitaka.FAILURE),sum(stats_counts.zuul.pipeline.periodic-stable.job.periodic-networking-midonet-docs-mitaka.{SUCCESS,FAILURE})),'24hours'), 'periodic-networking-midonet-docs-mitaka')
59 56
             - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.periodic.job.periodic-networking-midonet-py35-with-neutron-lib-master.FAILURE),sum(stats_counts.zuul.pipeline.periodic.job.periodic-networking-midonet-py35-with-neutron-lib-master.{SUCCESS,FAILURE})),'24hours'), 'periodic-networking-midonet-py35-with-neutron-lib-master')
60 57
           type: graph

+ 0
- 62
jenkins/jobs/networking-midonet.yaml View File

@@ -1,65 +1,3 @@
1
-- job-template:
2
-    name: '{pipeline}-tempest-dsvm-networking-midonet-v1-{node}{suffix}'
3
-    node: '{node}'
4
-
5
-    wrappers:
6
-      - build-timeout:
7
-          timeout: 130
8
-      - timestamps
9
-
10
-    builders:
11
-      - print-template-name:
12
-          template-name: "{template-name}"
13
-      - link-logs
14
-      - net-info
15
-      - devstack-checkout
16
-      - shell: |
17
-          #!/bin/bash -xe
18
-          export PYTHONUNBUFFERED=true
19
-          export DEVSTACK_GATE_NEUTRON=1
20
-          export DEVSTACK_GATE_TEMPEST=1
21
-          export BRANCH_OVERRIDE={branch-override}
22
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
23
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
24
-          fi
25
-          # Because we are testing a non standard project, add
26
-          # our project repository. This makes zuul do the right
27
-          # reference magic for testing changes.
28
-          export PROJECTS="openstack/networking-midonet $PROJECTS"
29
-
30
-          if [[ ! "stable/mitaka" =~ $ZUUL_BRANCH ]]; then
31
-              function gate_hook {{
32
-                  bash -xe $BASE/new/networking-midonet/devstack/ci/gate_hook.sh v1
33
-              }}
34
-              export -f gate_hook
35
-          else
36
-              # Note the actual url here is somewhat irrelevant because it
37
-              # caches in nodepool, however make it a valid url for
38
-              # documentation purposes.
39
-              export DEVSTACK_LOCAL_CONFIG="enable_plugin networking-midonet git://git.openstack.org/openstack/networking-midonet"
40
-              export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_PLUGIN=midonet"
41
-              export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_RUN_VALIDATION=True"
42
-
43
-              # Enable MidoNet v1 architecture
44
-              export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_PLUGIN=midonet.neutron.plugin_v1.MidonetPluginV2"
45
-              export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_CLIENT=midonet.neutron.client.api.MidonetApiClient"
46
-              export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_USE_ZOOM=False"
47
-              # NOTE(yamamoto): v2015.06 is the latest stable releases
48
-              # with v1 support.
49
-              # REVISIT(yamamoto): Consider switching to stable/v2015.06.4
50
-              # when available.
51
-              export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_BRANCH=staging/v2015.06"
52
-          fi
53
-
54
-          export DEVSTACK_GATE_SETTINGS=/opt/stack/new/networking-midonet/devstack/devstackgaterc
55
-
56
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
57
-          ./safe-devstack-vm-gate-wrap.sh
58
-
59
-    publishers:
60
-      - devstack-logs
61
-      - console-log
62
-
63 1
 - job-template:
64 2
     name: '{pipeline}-tempest-dsvm-networking-midonet-{midonet-plugin}-{node}{suffix}'
65 3
     node: '{node}'

+ 0
- 24
jenkins/jobs/projects.yaml View File

@@ -7767,7 +7767,6 @@
7767 7767
     jobs:
7768 7768
       - coverage-jobs
7769 7769
       - python-jobs
7770
-      - python-mitaka-bitrot-jobs
7771 7770
       - python-newton-bitrot-jobs
7772 7771
       - python-ocata-bitrot-jobs
7773 7772
       - pypi-jobs
@@ -7775,11 +7774,6 @@
7775 7774
       - translation-jobs
7776 7775
       - openstack-releasenotes-jobs
7777 7776
       - periodic-python-jobs-with-neutron-lib-master
7778
-      - '{pipeline}-tempest-dsvm-networking-midonet-v1-{node}{suffix}':
7779
-          pipeline: gate
7780
-          node: ubuntu-trusty
7781
-          suffix: '-nv'
7782
-          branch-override: default
7783 7777
       - '{pipeline}-tempest-dsvm-networking-midonet-{midonet-plugin}-{node}{suffix}':
7784 7778
           pipeline: gate
7785 7779
           midonet-plugin: v2
@@ -7798,12 +7792,6 @@
7798 7792
           node: ubuntu-xenial
7799 7793
           suffix: '-nv'
7800 7794
           branch-override: default
7801
-      - '{pipeline}-tempest-dsvm-networking-midonet-{midonet-plugin}-{node}{suffix}':
7802
-          pipeline: gate
7803
-          midonet-plugin: v2
7804
-          node: ubuntu-trusty
7805
-          suffix: ''
7806
-          branch-override: default
7807 7795
       - '{pipeline}-tempest-dsvm-networking-midonet-{midonet-plugin}-{node}{suffix}':
7808 7796
           pipeline: periodic
7809 7797
           midonet-plugin: ml2-full
@@ -7822,12 +7810,6 @@
7822 7810
           node: ubuntu-xenial
7823 7811
           suffix: '-newton'
7824 7812
           branch-override: stable/newton
7825
-      - '{pipeline}-tempest-dsvm-networking-midonet-{midonet-plugin}-{node}{suffix}':
7826
-          pipeline: periodic
7827
-          midonet-plugin: v2
7828
-          node: ubuntu-trusty
7829
-          suffix: '-mitaka'
7830
-          branch-override: stable/mitaka
7831 7813
       - '{pipeline}-tempest-dsvm-networking-midonet-{midonet-plugin}-{node}{suffix}':
7832 7814
           pipeline: gate
7833 7815
           midonet-plugin: ml2
@@ -7858,12 +7840,6 @@
7858 7840
           node: ubuntu-xenial
7859 7841
           suffix: '-nv'
7860 7842
           branch-override: default
7861
-      - '{pipeline}-tempest-dsvm-networking-midonet-{midonet-plugin}-{node}{suffix}':
7862
-          pipeline: gate
7863
-          midonet-plugin: ml2
7864
-          node: ubuntu-trusty
7865
-          suffix: '-nv'
7866
-          branch-override: default
7867 7843
       - '{pipeline}-networking-midonet-rally-dsvm-{midonet-plugin}-{node}{suffix}':
7868 7844
           pipeline: gate
7869 7845
           midonet-plugin: v2

+ 4
- 14
zuul/layout.yaml View File

@@ -2511,16 +2511,16 @@ jobs:
2511 2511
     branch: ^(?!stable/mitaka).*$
2512 2512
 
2513 2513
   - name: ^gate-tempest-dsvm-networking-midonet-.+-full-ubuntu-xenial
2514
-    branch: ^(?!stable/(mitaka|newton)).*$
2514
+    branch: ^(?!stable/newton).*$
2515 2515
 
2516 2516
   - name: ^gate-tempest-dsvm-networking-midonet-.+-full-legacy-ubuntu-xenial
2517
-    branch: ^(?!stable/(mitaka|newton|ocata)).*$
2517
+    branch: ^(?!stable/(newton|ocata)).*$
2518 2518
 
2519 2519
   - name: ^gate-grenade-dsvm-networking-midonet-ml2-ubuntu-xenial
2520
-    branch: ^(?!stable/(mitaka|newton)).*$
2520
+    branch: ^(?!stable/newton).*$
2521 2521
 
2522 2522
   - name: ^gate-grenade-dsvm-networking-midonet-v2-ubuntu-xenial
2523
-    branch: ^(?!stable/(mitaka|newton|ocata)).*$
2523
+    branch: ^(?!stable/(newton|ocata)).*$
2524 2524
 
2525 2525
   - name: ^gate-networking-midonet-rally-dsvm-.+-ubuntu-xenial
2526 2526
     branch: ^(?!stable/newton).*$
@@ -12790,7 +12790,6 @@ projects:
12790 12790
       - name: python-jobs
12791 12791
       - name: python34-jobs
12792 12792
       - name: python35-jobs
12793
-      - name: periodic-mitaka
12794 12793
       - name: periodic-newton
12795 12794
       - name: periodic-ocata
12796 12795
       - name: periodic-jobs-with-neutron-lib-master
@@ -12799,29 +12798,20 @@ projects:
12799 12798
       - name: release-notes-jobs
12800 12799
       - name: translation-jobs
12801 12800
     check:
12802
-      # NOTE(yamamoto): No v1 xenial job as it isn't compatible with xenial.
12803
-      - gate-tempest-dsvm-networking-midonet-v1-ubuntu-trusty-nv
12804 12801
       - gate-tempest-dsvm-networking-midonet-v2-ubuntu-xenial
12805 12802
       - gate-tempest-dsvm-networking-midonet-v2-full-ubuntu-xenial-nv
12806
-      - gate-tempest-dsvm-networking-midonet-v2-ubuntu-trusty
12807
-      # NOTE(yamamoto): ml2 job is voting only for Newton and later,
12808
-      # which happen to use xenial.
12809 12803
       - gate-tempest-dsvm-networking-midonet-ml2-ubuntu-xenial
12810 12804
       - gate-tempest-dsvm-networking-midonet-ml2-centos-7-nv
12811 12805
       - gate-tempest-dsvm-networking-midonet-ml2-full-ubuntu-xenial-nv
12812 12806
       - gate-tempest-dsvm-networking-midonet-ml2-full-centos-7-nv
12813
-      - gate-tempest-dsvm-networking-midonet-ml2-ubuntu-trusty-nv
12814
-      - networking-midonet-coverage-ubuntu-trusty-nv
12815 12807
       - networking-midonet-coverage-ubuntu-xenial-nv
12816 12808
       - gate-grenade-dsvm-networking-midonet-ml2-ubuntu-xenial-nv
12817 12809
       - gate-networking-midonet-rally-dsvm-ml2-ubuntu-xenial-nv
12818 12810
       - gate-networking-midonet-rally-dsvm-v2-ubuntu-xenial-nv
12819 12811
     gate:
12820 12812
       - gate-tempest-dsvm-networking-midonet-v2-ubuntu-xenial
12821
-      - gate-tempest-dsvm-networking-midonet-v2-ubuntu-trusty
12822 12813
       - gate-tempest-dsvm-networking-midonet-ml2-ubuntu-xenial
12823 12814
     periodic:
12824
-      - periodic-tempest-dsvm-networking-midonet-v2-ubuntu-trusty-mitaka
12825 12815
       - periodic-tempest-dsvm-networking-midonet-v2-ubuntu-xenial-newton
12826 12816
       - periodic-tempest-dsvm-networking-midonet-v2-full-ubuntu-xenial-ocata
12827 12817
       - periodic-tempest-dsvm-networking-midonet-ml2-full-ubuntu-xenial-ocata

Loading…
Cancel
Save