diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1a4a80d..085707d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,6 @@ cache: key: "$CI_PROJECT_NAME-cache" paths: - images - - rpm-docker .build_docker_images: image: docker:stable @@ -37,16 +36,6 @@ cache: only: - tags -.get_docker_rpm: - image: "centos:7" - before_script: - - mkdir -p rpm-docker/docker-ce && mkdir -p rpm-docker/docker-compose - - yum-config-manager --add-repo http://mirrors.aliyun.com/docker-ce/linux/centos/docker-ce.repo - - yum -y install epel-release - tags: - - share - only: - - tags images_build: stage: build @@ -64,27 +53,17 @@ images_build: - docker build -t $BADSSL_IMAGE_TAG -f ./badssl.com/Dockerfile ./badssl.com/ - docker save $BADSSL_IMAGE_TAG > images/badssl.tar -docker_rpm_get: - stage: build - extends: .get_docker_rpm - script: - - yum install docker-ce --downloadonly --downloaddir=./rpm-docker/docker-ce - - yum install docker-compose --downloadonly --downloaddir=./rpm-docker/docker-compose rpm_build: stage: upload variables: PACKAGE: 1 UPLOAD: 1 - DOCKER_CE_RPM_UPLOAD: 1 VER_NAME: $CI_COMMIT_REF_NAME PULP3_RPM_REPO_NAME: tsg-stable-x86_64.el7 PULP3_RPM_DIST_NAME: tsg-stable-x86_64.el7 - PULP3_FILE_REPO_NAME: install-package-stable - PULP3_FILE_DIST_NAME: install-package-stable extends: .build_rpm script: - ./ci/travis.sh dependencies: - images_build - - docker_rpm_get diff --git a/ci/travis.sh b/ci/travis.sh index 8f1cbe0..0876df5 100644 --- a/ci/travis.sh +++ b/ci/travis.sh @@ -49,9 +49,4 @@ if [ -n "${UPLOAD}" ]; then python3 rpm_upload_tools.py ${PULP3_RPM_REPO_NAME} ${PULP3_RPM_DIST_NAME} *.rpm fi -if [ -n "${DOCKER_CE_RPM_UPLOAD}" ]; then - cp ~/file_upload_tools.py ./ - tar -zcvf docker-rpm-${VER_NAME}.tar.gz ../rpm-docker - python3 file_upload_tools.py ${PULP3_FILE_REPO_NAME} ${PULP3_FILE_DIST_NAME} *.tar.gz -fi diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 26b0f55..38e9407 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -82,7 +82,7 @@ services: echo '0 2 * * * /usr/local/bin/python /root/unittest/clear_file_timeout.py' > /etc/crontabs/root echo '0 2 * * * /usr/local/bin/python /root/unittest/clear_file_timeout.py -d /root/result_tsg_diagnose/conn_traffic_status' > /etc/crontabs/root crond - python /root/unittest/tsg_diagnose.py -l + python /root/unittest/tsg_diagnose.py -l -w NEZHA networks: diff --git a/unittest_python/unittest/etc/tsg-diagnose.config b/unittest_python/unittest/etc/tsg-diagnose.config index 5b7b9cd..abe813c 100644 --- a/unittest_python/unittest/etc/tsg-diagnose.config +++ b/unittest_python/unittest/etc/tsg-diagnose.config @@ -113,12 +113,12 @@ max_recv_speed_large = 6553600 [test_https_con_traffic_16M] enabled = 1 -conn_timeout = 3 +conn_timeout = 4 max_recv_speed_large = 6553600 [test_https_con_traffic_64M] enabled = 1 -conn_timeout = 11 +conn_timeout = 12 max_recv_speed_large = 6553600 [start_time_random_delay_range]