From 87ab59067662df193849f5462006f83fa530d009 Mon Sep 17 00:00:00 2001 From: patternos Date: Wed, 6 Apr 2022 10:03:32 +0800 Subject: [PATCH 01/13] auto commit --- .gitlab-ci.yml | 8 ++++++++ 1.ci.caller.sh | 10 ++++++++++ 2.ci.expect.sh | 17 +++++++++++++++++ 3.ci.worker.sh | 24 ++++++++++++++++++++++++ 4 files changed, 59 insertions(+) create mode 100644 .gitlab-ci.yml create mode 100644 1.ci.caller.sh create mode 100644 2.ci.expect.sh create mode 100644 3.ci.worker.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..c41f272 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,8 @@ +# 1 开发环境 +1.build: + stage: build + tags: + - shell-atzlinux + script: + - unset DOCKER_HOST + - ./1.ci.caller.sh diff --git a/1.ci.caller.sh b/1.ci.caller.sh new file mode 100644 index 0000000..160bded --- /dev/null +++ b/1.ci.caller.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +#打开执行过程显示 +set +x +#显示设置环境变量 CMD_PATH当前脚本所在目录 +export CMD_PATH=$(cd `dirname $0`; pwd) + +cd $CMD_PATH + +./2.ci.expect.sh diff --git a/2.ci.expect.sh b/2.ci.expect.sh new file mode 100644 index 0000000..50ce1f7 --- /dev/null +++ b/2.ci.expect.sh @@ -0,0 +1,17 @@ +#!/usr/bin/expect -f +set timeout -1 + +spawn ./3.ci.worker.sh + +expect { + "Enter Import Password" + { + send "\r" + exp_continue + } + "Which services should be restarted" + { + send "1\r" + exp_continue + } +} diff --git a/3.ci.worker.sh b/3.ci.worker.sh new file mode 100644 index 0000000..6e0e924 --- /dev/null +++ b/3.ci.worker.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +#打开执行过程显示 +set -x +#显示设置环境变量 CMD_PATH当前脚本所在目录 +export CMD_PATH=$(cd `dirname $0`; pwd) +export PROJECT_NAME="${CMD_PATH##*/}" +echo $PROJECT_NAME +cd $CMD_PATH +apt install simple-cdd -y +cd isodvd +rm -rf tmp/mirror/db/lockfile +./amd64.build.sh + +# 1007.4.deb.control.gen.sh +# 1007.5.deb.make.sh +# 1007.6.deb.install.sh + +# 1007.19.docker.build.sh +# 1007.20.docker.push.sh +# 1007.21.kompose.convert.sh +# 1007.22.k8s.deploy.dev.sh + +# 1007.23.k8s.deploy.qingdao.sh -- Gitee From 77146e6bb06b67e761d3a4b2c5586d4ed11071b6 Mon Sep 17 00:00:00 2001 From: patternos Date: Wed, 6 Apr 2022 10:06:30 +0800 Subject: [PATCH 02/13] auto commit --- .gitlab-ci.yml | 5 ++--- 1.ci.caller.sh | 5 ----- 3.ci.worker.sh | 11 ----------- 3 files changed, 2 insertions(+), 19 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c41f272..71c1575 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,8 +1,7 @@ -# 1 开发环境 -1.build: +1.jihu.build: stage: build tags: - - shell-atzlinux + - shell-atzlinux-jihu script: - unset DOCKER_HOST - ./1.ci.caller.sh diff --git a/1.ci.caller.sh b/1.ci.caller.sh index 160bded..3747418 100644 --- a/1.ci.caller.sh +++ b/1.ci.caller.sh @@ -1,10 +1,5 @@ #!/usr/bin/env bash - -#打开执行过程显示 set +x -#显示设置环境变量 CMD_PATH当前脚本所在目录 export CMD_PATH=$(cd `dirname $0`; pwd) - cd $CMD_PATH - ./2.ci.expect.sh diff --git a/3.ci.worker.sh b/3.ci.worker.sh index 6e0e924..7904140 100644 --- a/3.ci.worker.sh +++ b/3.ci.worker.sh @@ -11,14 +11,3 @@ apt install simple-cdd -y cd isodvd rm -rf tmp/mirror/db/lockfile ./amd64.build.sh - -# 1007.4.deb.control.gen.sh -# 1007.5.deb.make.sh -# 1007.6.deb.install.sh - -# 1007.19.docker.build.sh -# 1007.20.docker.push.sh -# 1007.21.kompose.convert.sh -# 1007.22.k8s.deploy.dev.sh - -# 1007.23.k8s.deploy.qingdao.sh -- Gitee From b7fbe50f73f452085332260f5515dd18655075e0 Mon Sep 17 00:00:00 2001 From: patternos Date: Wed, 6 Apr 2022 10:10:49 +0800 Subject: [PATCH 03/13] auto commit --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 184c7d3..a16628c 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ .nfs* atzlinux-archive-keyring_lastest_all.deb + +isodvd/tmp -- Gitee From 533e10d1a227d48b180a5823e278432ce859d4ea Mon Sep 17 00:00:00 2001 From: patternos Date: Wed, 6 Apr 2022 10:11:22 +0800 Subject: [PATCH 04/13] auto commit --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 71c1575..0892601 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ -1.jihu.build: +1.build: stage: build tags: - - shell-atzlinux-jihu + - shell-atzlinux script: - unset DOCKER_HOST - ./1.ci.caller.sh -- Gitee From ac3107dde1d004696192778d5f2e230420f64b1b Mon Sep 17 00:00:00 2001 From: patternos Date: Wed, 6 Apr 2022 10:12:31 +0800 Subject: [PATCH 05/13] auto commit --- 1.ci.caller.sh | 0 2.ci.expect.sh | 0 3.ci.worker.sh | 0 3 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 1.ci.caller.sh mode change 100644 => 100755 2.ci.expect.sh mode change 100644 => 100755 3.ci.worker.sh diff --git a/1.ci.caller.sh b/1.ci.caller.sh old mode 100644 new mode 100755 diff --git a/2.ci.expect.sh b/2.ci.expect.sh old mode 100644 new mode 100755 diff --git a/3.ci.worker.sh b/3.ci.worker.sh old mode 100644 new mode 100755 -- Gitee From 89d8ad5c3c79d8ade1cca982131bf61b2e23b527 Mon Sep 17 00:00:00 2001 From: patternos Date: Wed, 6 Apr 2022 10:14:14 +0800 Subject: [PATCH 06/13] --force-root auto commit --- isodvd/amd64.build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/isodvd/amd64.build.sh b/isodvd/amd64.build.sh index c2a28c1..13fcaca 100755 --- a/isodvd/amd64.build.sh +++ b/isodvd/amd64.build.sh @@ -1 +1 @@ -build-simple-cdd --debug --dvd --proposed-updates --dist buster --locale zh_CN --keyboard us --security-mirror https://mirrors.huaweicloud.com/debian-security/ --debian-mirror https://mirrors.huaweicloud.com/debian/ -b amd64.build +build-simple-cdd --force-root --debug --dvd --proposed-updates --dist buster --locale zh_CN --keyboard us --security-mirror https://mirrors.huaweicloud.com/debian-security/ --debian-mirror https://mirrors.huaweicloud.com/debian/ -b amd64.build -- Gitee From ef290e8ad40bb01d0f679b0509538df9380916f8 Mon Sep 17 00:00:00 2001 From: patternos Date: Wed, 6 Apr 2022 10:16:46 +0800 Subject: [PATCH 07/13] auto commit --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0892601..20135c1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ 1.build: stage: build tags: - - shell-atzlinux + - shell-atzlinux-jihu script: - unset DOCKER_HOST - ./1.ci.caller.sh -- Gitee From 72827174bcf2ad588a937028c55cb57d8c71dd7f Mon Sep 17 00:00:00 2001 From: patternos Date: Wed, 6 Apr 2022 10:19:24 +0800 Subject: [PATCH 08/13] auto commit --- 3.ci.worker.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/3.ci.worker.sh b/3.ci.worker.sh index 7904140..e448f24 100755 --- a/3.ci.worker.sh +++ b/3.ci.worker.sh @@ -10,4 +10,5 @@ cd $CMD_PATH apt install simple-cdd -y cd isodvd rm -rf tmp/mirror/db/lockfile +set -e ./amd64.build.sh -- Gitee From 3222c1144d0956e38a09a183f97c7bfb2680267d Mon Sep 17 00:00:00 2001 From: patternos Date: Wed, 6 Apr 2022 10:23:34 +0800 Subject: [PATCH 09/13] auto commit --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 3b60c52..4ed1cab 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,7 @@ +# 持续继承构建状态 + +[![pipeline status](https://jihulab.com/act365/atzlinux/debian-cn/badges/ci-build-jihu/pipeline.svg)](https://jihulab.com/act365/atzlinux/debian-cn/-/commits/ci-build-jihu) + # 《铜豌豆 Linux》-- 中文 Linux 桌面操作系统 ![《铜豌豆 Linux》图标](https://cdn.atzlinux.com/pics/logo/atzlinux_144x144.png) -- Gitee From 41699e9a57611f29023b65614726352195d72c6f Mon Sep 17 00:00:00 2001 From: patternos Date: Wed, 6 Apr 2022 10:28:19 +0800 Subject: [PATCH 10/13] auto commit --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 4ed1cab..1a70d75 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@ [![pipeline status](https://jihulab.com/act365/atzlinux/debian-cn/badges/ci-build-jihu/pipeline.svg)](https://jihulab.com/act365/atzlinux/debian-cn/-/commits/ci-build-jihu) +* 构建历史日志: https://jihulab.com/act365/atzlinux/debian-cn/-/pipelines + # 《铜豌豆 Linux》-- 中文 Linux 桌面操作系统 ![《铜豌豆 Linux》图标](https://cdn.atzlinux.com/pics/logo/atzlinux_144x144.png) -- Gitee From 9536dd9524e3c62087fb292e742c220c2f2be89e Mon Sep 17 00:00:00 2001 From: patternos Date: Wed, 6 Apr 2022 10:39:58 +0800 Subject: [PATCH 11/13] auto commit --- 3.ci.worker.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/3.ci.worker.sh b/3.ci.worker.sh index e448f24..8b18229 100755 --- a/3.ci.worker.sh +++ b/3.ci.worker.sh @@ -1,8 +1,5 @@ #!/usr/bin/env bash - -#打开执行过程显示 set -x -#显示设置环境变量 CMD_PATH当前脚本所在目录 export CMD_PATH=$(cd `dirname $0`; pwd) export PROJECT_NAME="${CMD_PATH##*/}" echo $PROJECT_NAME -- Gitee From b7d51ffe7ce54c1779503d407747243b22ea4e50 Mon Sep 17 00:00:00 2001 From: patternos Date: Wed, 6 Apr 2022 10:42:55 +0800 Subject: [PATCH 12/13] auto commit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1a70d75..be041ae 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# 持续继承构建状态 +# 持续集成构建状态 [![pipeline status](https://jihulab.com/act365/atzlinux/debian-cn/badges/ci-build-jihu/pipeline.svg)](https://jihulab.com/act365/atzlinux/debian-cn/-/commits/ci-build-jihu) -- Gitee From 4200bf159d1c4fa71eb7811795ea32f488ee0212 Mon Sep 17 00:00:00 2001 From: act365 Date: Wed, 6 Apr 2022 10:46:42 +0800 Subject: [PATCH 13/13] auto commit --- 3.ci.worker.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/3.ci.worker.sh b/3.ci.worker.sh index 8b18229..d2314c5 100755 --- a/3.ci.worker.sh +++ b/3.ci.worker.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -x + export CMD_PATH=$(cd `dirname $0`; pwd) export PROJECT_NAME="${CMD_PATH##*/}" echo $PROJECT_NAME @@ -7,5 +7,4 @@ cd $CMD_PATH apt install simple-cdd -y cd isodvd rm -rf tmp/mirror/db/lockfile -set -e ./amd64.build.sh -- Gitee