Browse Source

Merge "Change CI job to use python3"

Zuul 4 months ago
parent
commit
6c37c501bd

+ 15
- 0
playbooks/legacy/virtualbmc-tempest-ironic-ipmi-iscsi-python2/post.yaml View File

@@ -0,0 +1,15 @@
1
+- hosts: primary
2
+  tasks:
3
+
4
+    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
5
+      synchronize:
6
+        src: '{{ ansible_user_dir }}/workspace/'
7
+        dest: '{{ zuul.executor.log_root }}'
8
+        mode: pull
9
+        copy_links: true
10
+        verify_host: true
11
+        rsync_opts:
12
+          - --include=/logs/**
13
+          - --include=*/
14
+          - --exclude=*
15
+          - --prune-empty-dirs

+ 125
- 0
playbooks/legacy/virtualbmc-tempest-ironic-ipmi-iscsi-python2/run.yaml View File

@@ -0,0 +1,125 @@
1
+- hosts: all
2
+  name: Autoconverted job legacy-tempest-dsvm-ironic-pxe_ipmitool-virtualbmc-src from
3
+    old job gate-tempest-dsvm-ironic-pxe_ipmitool-virtualbmc-src-ubuntu-xenial
4
+  tasks:
5
+
6
+    - name: Ensure legacy workspace directory
7
+      file:
8
+        path: '{{ ansible_user_dir }}/workspace'
9
+        state: directory
10
+
11
+    - shell:
12
+        cmd: |
13
+          set -e
14
+          set -x
15
+          cat > clonemap.yaml << EOF
16
+          clonemap:
17
+            - name: openstack-infra/devstack-gate
18
+              dest: devstack-gate
19
+          EOF
20
+          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
21
+              git://git.openstack.org \
22
+              openstack-infra/devstack-gate
23
+        executable: /bin/bash
24
+        chdir: '{{ ansible_user_dir }}/workspace'
25
+      environment: '{{ zuul | zuul_legacy_vars }}'
26
+
27
+    - shell:
28
+        cmd: |
29
+          cat << 'EOF' >> ironic-extra-vars
30
+            export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=384"
31
+            export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=tinyipa"
32
+          EOF
33
+        chdir: '{{ ansible_user_dir }}/workspace'
34
+      environment: '{{ zuul | zuul_legacy_vars }}'
35
+
36
+    - shell:
37
+        cmd: |
38
+          cat << 'EOF' >> ironic-extra-vars
39
+            export DEVSTACK_GATE_TEMPEST_REGEX="ironic_tempest_plugin.tests.scenario"
40
+
41
+          EOF
42
+        chdir: '{{ ansible_user_dir }}/workspace'
43
+      environment: '{{ zuul | zuul_legacy_vars }}'
44
+
45
+    - shell:
46
+        cmd: |
47
+          cat << 'EOF' >> ironic-extra-vars
48
+            export DEVSTACK_PROJECT_FROM_GIT="virtualbmc,$DEVSTACK_PROJECT_FROM_GIT"
49
+
50
+          EOF
51
+        chdir: '{{ ansible_user_dir }}/workspace'
52
+      environment: '{{ zuul | zuul_legacy_vars }}'
53
+
54
+    - shell:
55
+        cmd: |
56
+          cat << 'EOF' >> ironic-extra-vars
57
+            export DEVSTACK_PROJECT_FROM_GIT="pyghmi,$DEVSTACK_PROJECT_FROM_GIT"
58
+
59
+          EOF
60
+        chdir: '{{ ansible_user_dir }}/workspace'
61
+      environment: '{{ zuul | zuul_legacy_vars }}'
62
+
63
+    - shell:
64
+        cmd: |
65
+          cat << 'EOF' >> ironic-vars-early
66
+            # use tempest plugin
67
+            export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'"
68
+            export TEMPEST_CONCURRENCY=1
69
+          EOF
70
+        chdir: '{{ ansible_user_dir }}/workspace'
71
+      environment: '{{ zuul | zuul_legacy_vars }}'
72
+
73
+    - shell:
74
+        cmd: |
75
+          set -e
76
+          set -x
77
+          export PROJECTS="openstack/ironic $PROJECTS"
78
+          export PROJECTS="openstack/ironic-lib $PROJECTS"
79
+          export PROJECTS="openstack/ironic-python-agent $PROJECTS"
80
+          export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS"
81
+          export PROJECTS="openstack/python-ironicclient $PROJECTS"
82
+          export PROJECTS="openstack/pyghmi $PROJECTS"
83
+          export PROJECTS="openstack/virtualbmc $PROJECTS"
84
+          export PYTHONUNBUFFERED=true
85
+          export DEVSTACK_GATE_TEMPEST=1
86
+          export DEVSTACK_GATE_IRONIC=1
87
+          export DEVSTACK_GATE_NEUTRON=1
88
+          export DEVSTACK_GATE_VIRT_DRIVER=ironic
89
+          export DEVSTACK_GATE_CONFIGDRIVE=1
90
+          export DEVSTACK_GATE_IRONIC_DRIVER=ipmi
91
+          export DEVSTACK_GATE_USE_PYTHON3=False
92
+          export BRANCH_OVERRIDE=default
93
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
94
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
95
+          fi
96
+
97
+          if [[ ! "stable/newton stable/ocata stable/pike" =~ $ZUUL_BRANCH ]] ; then
98
+              export DEVSTACK_GATE_TLSPROXY=1
99
+          fi
100
+
101
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_TEMPEST_WHOLE_DISK_IMAGE=False"
102
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_EPHEMERAL_DISK=1"
103
+
104
+          export DEVSTACK_GATE_IRONIC_BUILD_RAMDISK=0
105
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_INSPECTOR_BUILD_RAMDISK=False"
106
+
107
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_COUNT=1"
108
+
109
+          # Ensure the ironic-vars-EARLY file exists
110
+          touch ironic-vars-early
111
+          # Pull in the EARLY variables injected by the optional builders
112
+          source ironic-vars-early
113
+
114
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic git://git.openstack.org/openstack/ironic"
115
+
116
+          # Ensure the ironic-EXTRA-vars file exists
117
+          touch ironic-extra-vars
118
+          # Pull in the EXTRA variables injected by the optional builders
119
+          source ironic-extra-vars
120
+
121
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
122
+          ./safe-devstack-vm-gate-wrap.sh
123
+        executable: /bin/bash
124
+        chdir: '{{ ansible_user_dir }}/workspace'
125
+      environment: '{{ zuul | zuul_legacy_vars }}'

+ 1
- 0
playbooks/legacy/virtualbmc-tempest-ironic-ipmi-iscsi/run.yaml View File

@@ -88,6 +88,7 @@
88 88
           export DEVSTACK_GATE_VIRT_DRIVER=ironic
89 89
           export DEVSTACK_GATE_CONFIGDRIVE=1
90 90
           export DEVSTACK_GATE_IRONIC_DRIVER=ipmi
91
+          export DEVSTACK_GATE_USE_PYTHON3=True
91 92
           export BRANCH_OVERRIDE=default
92 93
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then
93 94
               export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE

+ 23
- 0
zuul.d/legacy-virtualbmc-jobs.yaml View File

@@ -20,3 +20,26 @@
20 20
     run: playbooks/legacy/virtualbmc-tempest-ironic-ipmi-iscsi/run.yaml
21 21
     post-run: playbooks/legacy/virtualbmc-tempest-ironic-ipmi-iscsi/post.yaml
22 22
     timeout: 10800
23
+
24
+- job:
25
+    name: virtualbmc-tempest-ironic-ipmi-iscsi-python2
26
+    parent: legacy-dsvm-base
27
+    irrelevant-files:
28
+      - ^.*\.rst$
29
+      - ^doc/.*$
30
+      - ^virtualbmc/tests/.*$
31
+      - ^setup.cfg$
32
+      - ^test-requirements.txt$
33
+      - ^tools/.*$
34
+      - ^tox.ini$
35
+    required-projects:
36
+      - openstack/ironic
37
+      - openstack/ironic-lib
38
+      - openstack/ironic-python-agent
39
+      - openstack/ironic-tempest-plugin
40
+      - openstack/pyghmi
41
+      - openstack/python-ironicclient
42
+      - openstack/virtualbmc
43
+    run: playbooks/legacy/virtualbmc-tempest-ironic-ipmi-iscsi-python2/run.yaml
44
+    post-run: playbooks/legacy/virtualbmc-tempest-ironic-ipmi-iscsi-python2/post.yaml
45
+    timeout: 10800

+ 2
- 0
zuul.d/project.yaml View File

@@ -9,8 +9,10 @@
9 9
     check:
10 10
       jobs:
11 11
         - virtualbmc-tempest-ironic-ipmi-iscsi
12
+        - virtualbmc-tempest-ironic-ipmi-iscsi-python2
12 13
         - openstack-tox-lower-constraints
13 14
     gate:
14 15
       jobs:
15 16
         - virtualbmc-tempest-ironic-ipmi-iscsi
17
+        - virtualbmc-tempest-ironic-ipmi-iscsi-python2
16 18
         - openstack-tox-lower-constraints

Loading…
Cancel
Save