Browse Source

Merge "Improve kata-runsh job"

Zuul 10 months ago
parent
commit
c9a19d564f
3 changed files with 34 additions and 4 deletions
  1. 25
    1
      playbooks/kata-runsh/pre.yaml
  2. 7
    1
      playbooks/kata-runsh/run.yaml
  3. 2
    2
      zuul.d/jobs.yaml

+ 25
- 1
playbooks/kata-runsh/pre.yaml View File

@@ -1,6 +1,30 @@
1 1
 - hosts: all
2 2
   tasks:
3
+    - name: Install build-essential
4
+      package:
5
+        name: build-essential
6
+        state: present
7
+      become: yes
8
+    - name: Install golang
9
+      package:
10
+        name: golang-1.10
11
+        state: present
12
+      become: yes
13
+    - name: Make sure sources.list.d exists
14
+      file:
15
+        path: /etc/apt/sources.list.d
16
+        owner: root
17
+        group: root
18
+        mode: 0755
19
+        state: directory
20
+      become: yes
3 21
     - name: Run kata setup.sh
4 22
       args:
23
+        executable: /bin/bash
5 24
         chdir: "{{ zuul.project.src_dir }}"
6
-      command: ".ci/setup.sh"
25
+      shell: |
26
+        set -x
27
+        export PATH=$PATH:/usr/lib/go-1.10/bin
28
+        export CI=true
29
+        export GOPATH=$HOME
30
+        .ci/setup.sh

+ 7
- 1
playbooks/kata-runsh/run.yaml View File

@@ -2,5 +2,11 @@
2 2
   tasks:
3 3
     - name: Run kata run.sh
4 4
       args:
5
+        executable: /bin/bash
5 6
         chdir: "{{ zuul.project.src_dir }}"
6
-      command: ".ci/run.sh"
7
+      shell: |
8
+        set -x
9
+        export PATH=$PATH:/usr/lib/go-1.10/bin
10
+        export CI=true
11
+        export GOPATH=$HOME
12
+        .ci/run.sh

+ 2
- 2
zuul.d/jobs.yaml View File

@@ -1452,5 +1452,5 @@
1452 1452
     timeout: 3600
1453 1453
     nodeset:
1454 1454
       nodes:
1455
-        - name: ubuntu-bionic
1456
-          label: ubuntu-bionic-vexxhost
1455
+        - name: ubuntu-xenial
1456
+          label: ubuntu-xenial-vexxhost

Loading…
Cancel
Save