Browse Source

fix divingbell gate scripts

Change-Id: I3b1f472b9e78436672c67ce73cdd92d24e2e21ac
Anderson, Craig (ca846m) 7 months ago
parent
commit
73880a9973

+ 0
- 1
.zuul.yaml View File

@@ -15,7 +15,6 @@
15 15
       jobs:
16 16
         - airship-divingbell-linter
17 17
         - airship-divingbell-ubuntu:
18
-            voting: false
19 18
             irrelevant-files:
20 19
               - ^.*\.rst$
21 20
               - ^doc/.*$

+ 0
- 9
divingbell/tools/gate/setup.sh View File

@@ -1,9 +0,0 @@
1
-#!/bin/bash
2
-
3
-set -ex
4
-
5
-export TMP_DIR=$(mktemp -d)
6
-cd $TMP_DIR
7
-git clone https://git.openstack.org/openstack/openstack-helm
8
-cd openstack-helm/tools/gate/
9
-./setup_gate.sh

+ 2
- 1
tools/gate/playbooks/airship-divingbell-check.yaml View File

@@ -16,7 +16,8 @@
16 16
   tasks:
17 17
     - name: Build Charts
18 18
       shell: |
19
-        set -xe;
19
+        set -e;
20 20
         ./tools/gate/scripts/010-build-charts.sh
21
+        sudo ./tools/gate/scripts/020-test-divingbell.sh
21 22
       args:
22 23
         chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}"

+ 2
- 2
tools/gate/playbooks/osh-infra-deploy-docker.yaml View File

@@ -35,9 +35,9 @@
35 35
     - setup-firewall
36 36
     - deploy-python-pip
37 37
     - deploy-docker
38
-    - deploy-yq
38
+    - deploy-jq
39 39
   tags:
40 40
     - setup-firewall
41 41
     - deploy-python-pip
42 42
     - deploy-docker
43
-    - deploy-yq
43
+    - deploy-jq

divingbell/tools/gate/test.sh → tools/gate/scripts/020-test-divingbell.sh View File

@@ -10,9 +10,7 @@ NAME=divingbell
10 10
 mkdir -p "${LOGS_SUBDIR}"
11 11
 LOG_NAME="${LOGS_SUBDIR}/test.log"
12 12
 TEST_RESULTS="${LOGS_SUBDIR}/results.log"
13
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
14
-cd "${DIR}"
15
-BASE_VALS="--values=${DIR}/../../values.yaml"
13
+BASE_VALS="--values=divingbell/values.yaml"
16 14
 SYSCTL_KEY1=net.ipv4.conf.all.log_martians
17 15
 SYSCTL_VAL1_DEFAULT=1
18 16
 SYSCTL_KEY2=net.ipv4.conf.all.secure_redirects
@@ -46,6 +44,7 @@ USERNAME3=userthree
46 44
 USERNAME3_SUDO=true
47 45
 USERNAME4=userfour
48 46
 USERNAME4_SUDO=false
47
+type lshw || apt -y install lshw
49 48
 nic_info="$(lshw -class network)"
50 49
 physical_nic=''
51 50
 IFS=$'\n'
@@ -118,9 +117,6 @@ _reset_account(){
118 117
 }
119 118
 
120 119
 init_default_state(){
121
-  if [ "${1}" = 'make' ]; then
122
-    (cd ../../../; make)
123
-  fi
124 120
   purge_containers
125 121
   clean_persistent_files
126 122
   # set sysctl original vals
@@ -142,15 +138,15 @@ init_default_state(){
142 138
 
143 139
 install(){
144 140
   purge_containers
145
-  helm install --name="${NAME}" --debug "../../../${NAME}" --namespace="${NAME}" "$@"
141
+  helm install --name="${NAME}" --debug "${NAME}" --namespace="${NAME}" "$@"
146 142
 }
147 143
 
148 144
 upgrade(){
149
-  helm upgrade --name="${NAME}" --debug "../../../${NAME}" --namespace="${NAME}" "$@"
145
+  helm upgrade --name="${NAME}" --debug "${NAME}" --namespace="${NAME}" "$@"
150 146
 }
151 147
 
152 148
 dry_run(){
153
-  helm install --name="${NAME}" --dry-run --debug "../../../${NAME}" --namespace="${NAME}" "$@"
149
+  helm install --name="${NAME}" --dry-run --debug "${NAME}" --namespace="${NAME}" "$@"
154 150
 }
155 151
 
156 152
 get_container_status(){
@@ -976,7 +972,7 @@ test_overrides(){
976 972
 }
977 973
 
978 974
 # initialization
979
-init_default_state make
975
+init_default_state
980 976
 
981 977
 # run tests
982 978
 install_base

Loading…
Cancel
Save