修改获取 dockerenv 环境包是url错误问题

.gitlab-ci.yml

@@ -1,53 +1,35 @@
 stages:
 - build
-- upload    
+    
-
-cache:
-   key: "$CI_COMMIT_REF_SLUG$CI_COMMIT_TAG"
-   paths:
-     - /tmp/padding_for_PACK_TAR_BUILD_DIRS_PREFIX/tsg/tsg-scripts/build
-
 .build_tar:
-  image: "ansible/ansible:centos7"
+  image: "git.mesalab.cn:7443/mesa_platform/build-env:self-test-env"
   variables:
+    GIT_STRATEGY: "clone"
     BUILD_PADDING_PREFIX: /tmp/padding_for_PACK_TAR_BUILD_DIRS_PREFIX/
+    TESTING_VERSION_BUILD: 0
   before_script:
-    - pip install ansible
+    - dockerd > /dev/null &
-    - cp repo.internal.geedge.net.repo /etc/yum.repos.d/repo.internal.geedge.net.repo
+    - docker info
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
     - mkdir -p $BUILD_PADDING_PREFIX/$CI_PROJECT_NAMESPACE/
     - ln -s $CI_PROJECT_DIR $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH
     - cd $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH
-    - pwd
-    - chmod +x ./ci/travis-tar.sh
-  script:
-    - yum makecache
-    - ./ci/travis-tar.sh
-  tags:
-  - share
-
-.upload_tar:
-  image: "git.mesalab.cn:7443/mesa_platform/build-env:self-test-env"
-  before_script:
     - pwd
     - chmod +x ./ci/travis.sh
   script:
+    - yum makecache
     - ./ci/travis.sh
   tags:
   - share
-
+    
-rpm_build:
+file_build:
   stage: build
+  variables:
+    VER_NAME: $CI_COMMIT_REF_NAME
+    PULP3_REPO_NAME: install-package-stable
+    PULP3_DIST_NAME: install-package-stable
+
   extends: .build_tar
   only:
     - tags
 
-rpm_upload:
-  stage: upload
-  variables:
-    PULP3_FILE_REPO_NAME: install-package-stable
-    PULP3_FILE_DIST_NAME: install-package-stable
-  extends: .upload_tar
-  dependencies:
-    - rpm_build
-  only:
-    - tags

build_config/group_vars/local.yml

@@ -4,3 +4,7 @@ tarpath:
     - /tmp/padding_for_PACK_TAR_BUILD_DIRS_PREFIX/tsg/tsg-scripts/deploy.yml
     - /tmp/padding_for_PACK_TAR_BUILD_DIRS_PREFIX/tsg/tsg-scripts/roles/tsg-diagnose
   destdict: /tmp/padding_for_PACK_TAR_BUILD_DIRS_PREFIX/tsg/tsg-scripts/build/
+
+tsgDiagnoseDockerFile: 
+  unarchiveUrl: http://repo.internal.geedge.net/pulp/content/install/stable/package/docker-rpm-test-docker-ce-7.tar.gz
+  unarchiveDest: /tmp/padding_for_PACK_TAR_BUILD_DIRS_PREFIX/tsg/tsg-scripts/roles/tsg-diagnose/files

ci/travis-tar.sh

@@ -1,8 +0,0 @@
-#!/usr/bin/env sh
-mkdir build || true
-
-cat ./customize.yml >> ./build_config/group_vars/local.yml
-cat ./customize.yml >> ./install_config/group_vars/all.yml
-
-ansible-playbook -i ./build_config -e tarname=tsg-scripts-${VER_NAME}.tar.gz  buildPackage.yml
-ls -halt ./build/tsg-scripts-${VER_NAME}.tar.gz

ci/travis.sh

@@ -1,8 +1,14 @@
 #!/usr/bin/env sh
+mkdir build || true
 
-cd /tmp/padding_for_PACK_TAR_BUILD_DIRS_PREFIX/tsg/tsg-scripts/build
+cat ./customize.yml >> ./build_config/group_vars/local.yml
+cat ./customize.yml >> ./install_config/group_vars/all.yml
+
+ansible-playbook -i ./build_config -e tarname=tsg-scripts-${VER_NAME}.tar.gz  buildPackage.yml
+
+ls -halt ./build/tsg-scripts-${VER_NAME}.tar.gz
+
+cd build
 cp ~/file_upload_tools.py ./
-python3 file_upload_tools.py ${PULP3_FILE_REPO_NAME} ${PULP3_FILE_DIST_NAME} *.tar.gz
 
-cd / 
+python3 file_upload_tools.py ${PULP3_REPO_NAME} ${PULP3_DIST_NAME} *.tar.gz
-rm -rf /tmp/padding_for_PACK_TAR_BUILD_DIRS_PREFIX/tsg/tsg-scripts/build

customize.yml

@@ -2,4 +2,51 @@ rpmdict:
   tsgDiagnose:
     fullname: "tsg-diagnose-test_edit_name-1.el7.x86_64.rpm"
     name: "tsg-diagnose"
-    downpath: "/tmp/padding_for_PACK_TAR_BUILD_DIRS_PREFIX/tsg/tsg-scripts/roles/tsg-diagnose/files/rpms"
+    downpath: "/tmp/padding_for_PACK_TAR_BUILD_DIRS_PREFIX/tsg/tsg-scripts/roles/tsg-diagnose/files/rpms"
+
+dockerEnvRpm:
+  dockerCe:
+    - container-selinux-2.119.2-1.911c772.el7_8.noarch.rpm
+    - selinux-policy-targeted-3.13.1-266.el7_8.1.noarch.rpm
+    - selinux-policy-3.13.1-266.el7_8.1.noarch.rpm
+    - containerd.io-1.2.13-3.2.el7.x86_64.rpm
+    - policycoreutils-python-2.5-34.el7.x86_64.rpm
+    - policycoreutils-2.5-34.el7.x86_64.rpm
+    - libselinux-utils-2.5-15.el7.x86_64.rpm
+    - libselinux-python-2.5-15.el7.x86_64.rpm
+    - libseccomp-2.3.1-4.el7.x86_64.rpm
+    - iptables-1.4.21-34.el7.x86_64.rpm
+    - libcgroup-0.41-21.el7.x86_64.rpm
+    - audit-libs-python-2.8.5-4.el7.x86_64.rpm
+    - setools-libs-3.3.8-4.el7.x86_64.rpm
+    - libsemanage-python-2.5-14.el7.x86_64.rpm
+    - checkpolicy-2.5-8.el7.x86_64.rpm
+    - libnetfilter_conntrack-1.0.6-1.el7_3.x86_64.rpm
+    - python-IPy-0.75-6.el7.noarch.rpm
+    - libnfnetlink-1.0.1-4.el7.x86_64.rpm
+    - libmnl-1.0.3-7.el7.x86_64.rpm
+    - docker-ce-cli-19.03.12-3.el7.x86_64.rpm
+    - docker-ce-19.03.12-3.el7.x86_64.rpm
+  dockerCompose:
+    - libtirpc-0.2.4-0.16.el7.x86_64.rpm
+    - libyaml-0.1.4-11.el7_0.x86_64.rpm
+    - python3-3.6.8-13.el7.x86_64.rpm
+    - python36-cached_property-1.5.1-2.el7.noarch.rpm
+    - python36-chardet-3.0.4-1.el7.noarch.rpm
+    - python36-docker-2.6.1-3.el7.noarch.rpm
+    - python36-dockerpty-0.4.1-18.el7.noarch.rpm
+    - python36-docker-pycreds-0.2.1-2.el7.noarch.rpm
+    - python36-docopt-0.6.2-8.el7.noarch.rpm
+    - python36-idna-2.7-2.el7.noarch.rpm
+    - python36-jsonschema-2.5.1-4.el7.noarch.rpm
+    - python36-pysocks-1.6.8-7.el7.noarch.rpm
+    - python36-PyYAML-3.13-1.el7.x86_64.rpm
+    - python36-requests-2.14.2-2.el7.noarch.rpm
+    - python36-six-1.14.0-2.el7.noarch.rpm
+    - python36-texttable-1.6.2-1.el7.noarch.rpm
+    - python36-urllib3-1.25.6-1.el7.noarch.rpm
+    - python36-websocket-client-0.47.0-2.el7.noarch.rpm
+    - python3-libs-3.6.8-13.el7.x86_64.rpm
+    - python3-pip-9.0.3-7.el7_7.noarch.rpm
+    - python3-setuptools-39.2.0-10.el7.noarch.rpm
+    - docker-compose-1.18.0-4.el7.noarch.rpm

repo.internal.geedge.net.repo

@@ -1,24 +0,0 @@
-[mesa-platform]
-name=mesa-platform
-baseurl=http://repo.internal.geedge.net/pulp/content/mesa-platform-stable/
-gpgcheck=0
-
-[mesa-framework]
-name=mesa-framework
-baseurl=http://repo.internal.geedge.net/pulp/content/7/x86_64/stable/framework/
-gpgcheck=0
-
-[platform]
-name=platform
-baseurl=http://repo.internal.geedge.net/pulp/content/7/x86_64/stable/platform/
-gpgcheck=0
-
-[protocol]
-name=protocol
-baseurl=http://repo.internal.geedge.net/pulp/content/7/x86_64/stable/protocol/
-gpgcheck=0
-
-[tsg]
-name=tsg
-baseurl=http://repo.internal.geedge.net/pulp/content/7/x86_64/stable/tsg/
-gpgcheck=0

roles/package-build/tasks/DockerEnvDownload.yml

@@ -0,0 +1,6 @@
+---
+- name: 'Unarchive docker env rpm file from remote host'
+  unarchive:
+    src: "{{ tsgDiagnoseDockerFile.unarchiveUrl }}"
+    dest: "{{ tsgDiagnoseDockerFile.unarchiveDest }}"
+    remote_src: yes

roles/package-build/tasks/main.yml

@@ -1,3 +1,4 @@
 ---
+- include: DockerEnvDownload.yml
 - include: RpmDownload.yml
 - include: TarBuild.yml 

roles/tsg-diagnose/tasks/DockerEnv.yml

@@ -0,0 +1,19 @@
+--- 
+- name: "Install docker-ce"
+  yum:
+    name: "/tmp/ansible_deploy/tsg-diagnose/rpms/rpm-docker/docker-ce/{{ item }}"
+    state: present
+    with_items: "{{ dockerEnvRpm.dockerCe }}"
+
+- name: "Install docker-compose"
+  yum:
+    name: "/tmp/ansible_deploy/tsg-diagnose/rpms/rpm-docker/docker-compose/{{ item }}"
+    state: present
+    with_items: "{{ dockerEnvRpm.dockerCompose }}"
+
+- name: 'Docker service start'
+  systemd:
+    name: docker
+    enabled: yes
+    daemon_reload: yes
+

roles/tsg-diagnose/tasks/TsgDiagnose.yml

@@ -0,0 +1,12 @@
+--- 
+- name: "Install tsg-diagnose rpm package"
+  yum:
+    name:
+      - "/tmp/ansible_deploy/tsg-diagnose/rpms/{{rpmdict.tsgDiagnose.fullname}}"
+    state: present
+    
+- name: 'Tsg-diagnose service start'
+  systemd:
+    name: tsg-diagnose
+    enabled: yes
+    daemon_reload: yes

roles/tsg-diagnose/tasks/main.yml

@@ -1,21 +1,14 @@
 --- 
-- name: 'copy file to device'
+- name: 'Copy tsg-diagnose file to device'
   copy: 
     src: "{{item.src}}"
     dest: "{{item.dest}}"
     mode: "{{item.mode}}"
   with_items:
     - { src: "{{ role_path }}/files/", dest: "/tmp/ansible_deploy/tsg-diagnose", mode: '0755' }
-
-- name: "install kni rpms from localhost"
-  yum:
-    name:
-      - "/tmp/ansible_deploy/tsg-diagnose/rpms/{{rpmdict.tsgDiagnose.fullname}}"
-    state: present
     
-- name: 'tsg-diagnose service start and docker-compose up'
+- name: 'Install docker env rpm'
-  systemd:
+  include: DockerEnv.yml
-    name: tsg-diagnose
-    enabled: yes
-    daemon_reload: yes
 
+- name: 'Install Tsg-diagnose'
+  include: TsgDiagnose.yml