16d4ded5e2
Sync from upstream for: - bugfix: fix save multiple tags single image failed - tests: - pidofbuilder do not set when running a new bash script in new child process - shellcheck fix of common.sh - add integration tests for saving one image with multiple tags Signed-off-by: jingxiaolu <lujingxiao@huawei.com>
28 lines
754 B
Diff
28 lines
754 B
Diff
From c1061acaafa4120075fe83ca8075e593403cb6f8 Mon Sep 17 00:00:00 2001
|
|
From: xingweizheng <xingweizheng@huawei.com>
|
|
Date: Sun, 22 Aug 2021 12:21:21 +0800
|
|
Subject: [PATCH 1/4] bugfix: pidofbuilder do not set when running a new bash
|
|
script in new child process
|
|
|
|
---
|
|
tests/lib/common.sh | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/tests/lib/common.sh b/tests/lib/common.sh
|
|
index f393ee1..5cd66ff 100755
|
|
--- a/tests/lib/common.sh
|
|
+++ b/tests/lib/common.sh
|
|
@@ -13,6 +13,9 @@
|
|
# Create: 2020-03-01
|
|
# Description: common functions for tests
|
|
|
|
+# cross process environment for killing isula-builder
|
|
+declare -x pidofbuilder
|
|
+
|
|
# check if legacy builder exists
|
|
function pre_check() {
|
|
if pgrep isula-builder > /dev/null 2>&1; then
|
|
--
|
|
1.8.3.1
|
|
|