- Compass-ci - mailweb.openeuler.org

[PATCH lkp-tests 2/3] handle_ansible 04-8
by Wang Chenglong 22 Apr '21

22 Apr '21

Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- lib/handle_ansible.sh | 89 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 lib/handle_ansible.sh diff --git a/lib/handle_ansible.sh b/lib/handle_ansible.sh new file mode 100644 index 000000000..415abfba0 --- /dev/null +++ b/lib/handle_ansible.sh @@ -0,0 +1,89 @@ +#!/bin/bash + +epelrpm() +{ + sed -i "s/epel-release/bash/g" /root/.ansible/roles/*/tasks/*.yml +} + +include_vars() +{ + sed -i 's/{{ ansible_distribution_major_version }}/7/g' /root/.ansible/roles/*/tasks/*.yml + sed -i 's/{{ansible_distribution_major_version}}/7/g' /root/.ansible/roles/*/tasks/*.yml + sed -i 's/{{ ansible_distribution }}/CentOS/g' /root/.ansible/roles/*/tasks/*.yml + sed -i 's/{{ os_family | lower }}.yml/rhel.yml/g' /root/.ansible/roles/*/tasks/*.yml + sed -i 's/{{ ansible_distribution_file_variety }}/RedHat/g' /root/.ansible/roles/*/tasks/*.yml + sed -i 's/{{ os_name }}/redhat/g' /root/.ansible/roles/*/tasks/*.yml + sed -i 's/{{ os_release }}/rhel7/g' /root/.ansible/roles/*/tasks/*.yml + + grep with_first_found /root/.ansible/roles/*/tasks/*.yml + [ "$?" == "0" ] && { + sed -i '/with_first_found:/a\ - redhat-7.yml' /root/.ansible/roles/*/tasks/*.yml + } + + [ -d /root/.ansible/roles/*/vars/ansible_distribution ] && { + cp /root/.ansible/roles/*/vars/ansible_distribution/redhat.yml /root/.ansible/roles/*/vars/ansible_distribution/openeuler.yml + sed -i 's/centos/rhel' /root/.ansible/roles/*/vars/ansible_distribution/openeuler.yml + } + + cd /root/.ansible/roles/*/ + cp ./vars/RedHat-7.yml ./vars/RedHat-20.yml + cp ./vars/CentOS-7.yml ./vars/CentOS-20.yml + + cp ./vars/CentOS.yml ./vars/openEuler.yml + sed -i 's/\"7\"/\"20\"/g' ./vars/openEuler.yml + + cp vars/ansible_distribution/redhat.yml vars/ansible_distribution/openeuler.yml + cp vars/ansible_os_family/redhat.yml vars/ansible_os_family/openeuler.yml + + # GPG signature + grep 'state: present' ./tasks/install.yml + [ "$?" == "0" ] && { + sed -i '/yum:/a\ disable_gpg_check: yes' ./tasks/install.yml + } +} + +service_firewall() +{ + systemctl enable firewall +} + +service_redis() +{ + useradd redis -s /usr/sbin/nologin + mkdir -p /var/log/redis + chown -R redis:root /var/log/redis + mkdir -p /var/lib/redis + chown -R redis:root /var/lib/redis +} + +service_postgresql() +{ + sed -i 's/^replication_timeout/#replication_timeout/g' templates/postgresql.conf.j2 + sed -i 's/^checkpoint_segments/#checkpoint_segments/g' templates/postgresql.conf.j2 + sed -i 's/^sql_inheritance/#sql_inheritance/g' templates/postgresql.conf.j2 +} + +service_nfs() +{ + systemctl unmask network.target +} + +command_python() +{ + sed -i 's/3.6.5/3.7.5/g' /root/.ansible/roles/*/defaults/* + +} + + + + +handle_ansible() +{ + epelrpm + include_vars + service_firewall + service_redis + service_postgresql + service_nfs + command_python +} -- 2.23.0

1 0

[PATCH compass-ci] container/etcd: delete extra blank lines
by Liu Yinsi 22 Apr '21

22 Apr '21

Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- container/etcd/entry.sh | 1 - container/etcd/etcd_compact.sh | 1 - 2 files changed, 2 deletions(-) diff --git a/container/etcd/entry.sh b/container/etcd/entry.sh index 16c8d00..d1c906d 100755 --- a/container/etcd/entry.sh +++ b/container/etcd/entry.sh @@ -5,4 +5,3 @@ crond /bin/etcd "$@" exec - diff --git a/container/etcd/etcd_compact.sh b/container/etcd/etcd_compact.sh index acc20d0..e414371 100755 --- a/container/etcd/etcd_compact.sh +++ b/container/etcd/etcd_compact.sh @@ -4,4 +4,3 @@ rev=$(etcdctl endpoint status --write-out="json"|egrep -o '"revision":[0-9]*'|egrep -o '[0-9].*') etcdctl compact $rev && etcdctl defrag - -- 2.23.0

1 0

[PATCH compass-ci] sparrow/3-code/dev-env: fix error no such file /etc/compass-ci/passwd.yaml
by Liu Yinsi 22 Apr '21

22 Apr '21

[error] Traceback (most recent call last): 4: from ./start:50:in `<main>' 3: from /c/compass-ci/container/defconfig.rb:25:in `relevant_service_authentication' 2: from /usr/share/ruby/psych.rb:497:in `load_file' 1: from /usr/share/ruby/psych.rb:497:in `open' /usr/share/ruby/psych.rb:497:in `initialize': No such file or directory @ rb_sysopen - /etc/compass-ci/passwd.yaml (Errno::ENOENT) Signed-off-by: Liu Yinsi <liuyinsi(a)163.com> --- sparrow/3-code/dev-env | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sparrow/3-code/dev-env b/sparrow/3-code/dev-env index a478fffe..b68d9e67 100755 --- a/sparrow/3-code/dev-env +++ b/sparrow/3-code/dev-env @@ -189,6 +189,17 @@ auto-submit: my_name: auto-submit EOF +[[ -f /etc/compass-ci/passwd.yaml ]] || { +passwd=$(< /dev/urandom tr -dc "a-zA-Z0-9-=+@#_:/[](){}$%&.^*\!" | head -c 10;echo) + +cat > /etc/compass-ci/passwd.yaml <<EOF +ES_USER: root +ES_PASSWORD: $passwd +LOGGING_ES_USER: root +LOGGING_ES_PASSWORD: $passwd +EOF +} + source /etc/os-release path=$(dirname ${BASH_SOURCE[0]})/os/${ID} -- 2.23.0

1 0

[PATCH v2 lkp-tests] tests/qcow2rootfs-x86_64: fix failed to build container using absolute path
by Wang Chenglong 22 Apr '21

22 Apr '21

[Error] root@2288hv5-2s44p-384g--b6 /c/lkp-tests/tests# /c/compass-ci/container/qcow2rootfs/build /c/compass-ci/container/qcow2rootfs/build: line 5: ../defconfig.sh: No such file or directory /c/compass-ci/container/qcow2rootfs/build: line 7: docker_skip_rebuild: command not found Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- tests/qcow2rootfs-x86_64 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/qcow2rootfs-x86_64 b/tests/qcow2rootfs-x86_64 index f698fb7ec..5895c6304 100755 --- a/tests/qcow2rootfs-x86_64 +++ b/tests/qcow2rootfs-x86_64 @@ -12,10 +12,10 @@ set_qcow2rootfs_tools() git clone https://gitee.com/wu_fengguang/compass-ci.git /c/compass-ci || return 1 rm ${QCOW2_PATH}/root/etc/yum.repos.d/* wget -O ${QCOW2_PATH}/root/etc/yum.repos.d/CentOS-Base.repo https://repo.huaweicloud.com/repository/conf/CentOS-7-reg.repo - ${QCOW2_PATH}/build + cd ${QCOW2_PATH} + ./build || exit 1 sed -i 's#$EXTRACT_ROOT/bin/extract $QCOW2_FILE $tar_out_file#$EXTRACT_ROOT/bin/extract $EXTRACT_ROOT/qcow2-dir/$QCOW2_NAME $tar_out_file#' \ - ${QCOW2_PATH}/bin/mail - + ${QCOW2_PATH}/bin/main } check_url() @@ -52,7 +52,7 @@ extract_rootfs() export ROOTFS_DIR="${qcow2_version}-$(date +%Y-%m-%d-%H-%M-%S)" export ROOTFS_PATH="${MOUNT_POINT}/openeuler/${qcow2_arch}/automatic-build/${ROOTFS_DIR}" mkdir -p $ROOTFS_PATH - ${QCOW2_PATH}/run ${IMG_PATH}/${QCOW2_NAME} ${ROOTFS_PATH} + ${QCOW2_PATH}/run ${IMG_PATH}/${QCOW2_NAME} ${ROOTFS_PATH} || exit 1 } set_resolv_config() -- 2.23.0

1 1

[PATCH lkp-tests] tests/qcow2rootfs-x86_64: fix failed to build container using absolute path
by Wang Chenglong 22 Apr '21

22 Apr '21

[Error] root@2288hv5-2s44p-384g--b6 /c/lkp-tests/tests# /c/compass-ci/container/qcow2rootfs/build /c/compass-ci/container/qcow2rootfs/build: line 5: ../defconfig.sh: No such file or directory /c/compass-ci/container/qcow2rootfs/build: line 7: docker_skip_rebuild: command not found Signed-off-by: Wang Chenglong <18509160991(a)163.com> --- tests/qcow2rootfs-x86_64 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/qcow2rootfs-x86_64 b/tests/qcow2rootfs-x86_64 index f698fb7ec..2aecc3d4d 100755 --- a/tests/qcow2rootfs-x86_64 +++ b/tests/qcow2rootfs-x86_64 @@ -12,10 +12,10 @@ set_qcow2rootfs_tools() git clone https://gitee.com/wu_fengguang/compass-ci.git /c/compass-ci || return 1 rm ${QCOW2_PATH}/root/etc/yum.repos.d/* wget -O ${QCOW2_PATH}/root/etc/yum.repos.d/CentOS-Base.repo https://repo.huaweicloud.com/repository/conf/CentOS-7-reg.repo - ${QCOW2_PATH}/build + cd ${QCOW2_PATH} + ./build || exit 1 sed -i 's#$EXTRACT_ROOT/bin/extract $QCOW2_FILE $tar_out_file#$EXTRACT_ROOT/bin/extract $EXTRACT_ROOT/qcow2-dir/$QCOW2_NAME $tar_out_file#' \ ${QCOW2_PATH}/bin/mail - } check_url() @@ -52,7 +52,7 @@ extract_rootfs() export ROOTFS_DIR="${qcow2_version}-$(date +%Y-%m-%d-%H-%M-%S)" export ROOTFS_PATH="${MOUNT_POINT}/openeuler/${qcow2_arch}/automatic-build/${ROOTFS_DIR}" mkdir -p $ROOTFS_PATH - ${QCOW2_PATH}/run ${IMG_PATH}/${QCOW2_NAME} ${ROOTFS_PATH} + ${QCOW2_PATH}/run ${IMG_PATH}/${QCOW2_NAME} ${ROOTFS_PATH} || exit 1 } set_resolv_config() -- 2.23.0

1 1

help star
by Wu Fengguang 22 Apr '21

22 Apr '21

Yu Chuan is our help star, thanks Yu Chuan! 12.3 Yu Chuan 10.6 Wu Fengguang 9.8 Wei Jihui 9.2 Wang Yong 8.2 Liu Yinsi 7.1 Lin Jiaxin 6.7 Cao Xueliang 6.1 Liu Shaofei 5.6 Lu Weitao 3.8 Zhang Dewan 3.7 Wang Chenglong 3.7 Li Ping 3.2 Xu Xijian 2.5 Cui Yili 2.1 Luan Shengde 1.8 Bai Jing 1.8 Wu Zhende 1.8 Li Yuanchao 0.0 Du Kaitian 0.0 Zhang Yale

1 0

review star
by Wu Fengguang 22 Apr '21

22 Apr '21

Cao Xueliang is our review star, thanks Cao Xueliang! baijing@crystal ~/todo/bin% ./review-star Review email records in the last 7 days total review paragraph point people 111 6 6 19 Cao Xueliang 20 4 7 5 Wei Jihui 15 3 5 4 Liu Shaofei 11 1 2 3 Yu Chuan 24 4 10 3 Luan Shengde 6 1 1 1 Lin Jiaxin 3 2 3 1 Xu Xijian 3 1 1 0 Wang Yong 1 0 0 0 Zhang Dewan 19 0 0 0 Liu Yinsi 6 1 2 0 Lu Weitao 21 1 1 0 Wu Zhende 18 1 2 0 Li Yuanchao 4 0 0 0 Wu Fengguang 15 0 0 0 Cui Yili 11 0 0 0 Wang Chenglong 11 0 0 0 Bai Jing 5 0 0 0 Li Ping

1 0

git count
by Wu Fengguang 22 Apr '21

22 Apr '21

Cao Xueliang is our code star, thanks Cao Xueliang! baijing@crystal ~/todo/bin% ./git-count 16 Cao Xueliang 15 Wu Zhende 10 Li Yuanchao 6 Liu Yinsi 6 Yu Chuan 5 Liu Shaofei 5 Luan Shengde 4 Bai Jing 3 Wang Chenglong 2 Lu Weitao 2 Wang Yong 1 Xu Xijian 1 Lin Jiaxin 1 Li Ping 0 Du Kaitian 0 Wei Jihui 0 Wu Fengguang 0 Zhang Yale 0 Cui Yili 0 Zhang Dewan

1 0

[PATCH v2 compass-ci] es_query.rb: fix _scroll_id change
by Cui Yili 22 Apr '21

22 Apr '21

[why] _scroll_id will change every time query, so you need to save the last _scroll_id. Signed-off-by: Cui Yili <2268260388(a)qq.com> --- lib/es_query.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/es_query.rb b/lib/es_query.rb index dd6d97dc..8c5a28fe 100644 --- a/lib/es_query.rb +++ b/lib/es_query.rb @@ -45,11 +45,12 @@ class ESQuery }, size: size } result = @client.search index: @index, scroll: '10m', body: query - @scroll_id = result['_scroll_id'] - return result else - @client.scroll scroll: '10m', scroll_id: @scroll_id + result = @client.scroll scroll: '10m', scroll_id: @scroll_id end + + @scroll_id = result['_scroll_id'] unless result.empty? && result.include?('_scroll_id') + return result end def query_by_id(id) -- 2.23.0

1 0

[PATCH compass-ci] dracut-initrd: support local disk rootfs
by Yu Chuan 22 Apr '21

22 Apr '21

[Why] Allow user to submit a job that rootfs is in local disk by add 'custom_ipxe' field in job.yaml. Signed-off-by: Yu Chuan <13186087857(a)163.com> --- container/dracut-initrd/bin/set-local-sysroot.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/container/dracut-initrd/bin/set-local-sysroot.sh b/container/dracut-initrd/bin/set-local-sysroot.sh index 9e8374290230..1a2edafaf967 100644 --- a/container/dracut-initrd/bin/set-local-sysroot.sh +++ b/container/dracut-initrd/bin/set-local-sysroot.sh @@ -2,6 +2,10 @@ analyse_kernel_cmdline_params() { rootfs="$(getarg root=)" + + # if root is a local disk, then boot directly. + [[ $rootfs =~ ^/dev/ ]] && exit 0 + # example: $nfs_server_ip:/os/${os}/${os_arch}/${os_version}-snapshots/20210310005959 rootfs_src=$(echo $"$rootfs" | sed 's/\///') timestamp="$(basename $rootfs_src)" -- 2.23.0

1 0