diff --git a/.beagle.yml b/.beagle.yml index e744dc5faba2d28aac512d48559dc8a85dd4684d..c0703d644225cff381bfcf51ce70bae9afcd5f17 100644 --- a/.beagle.yml +++ b/.beagle.yml @@ -20,57 +20,57 @@ pipeline: branch: release-v2.1 ansible-amd64: - image: registry.cn-qingdao.aliyuncs.com/wod/ansible-kubernetes-image:v1.20.2 + image: registry.cn-qingdao.aliyuncs.com/wod/ansible-kubernetes-image:v1.20.6 pull: true dns: - 223.5.5.5 commands: - - cp -r ./ansible/main.yaml /etc/ansible/linux/main.yaml - - cd ansible - >- ansible-playbook /etc/ansible/linux/main.yaml --extra-vars '{ - "TARGET_ARCH":"amd64", - "TARGET_VERSION":"v2.1.3" + "REGISTRY_DATA_PATH": "/data/downloads/k8s/ansible/{{ TARGET_ARCH }}", + "REGISTRY_DATA_FILE": "images-harbor-{{ TARGET_VERSION }}.tar.gz", + "TARGET_ARCH":"amd64", + "TARGET_VERSION":"v2.1.3" }' --extra-vars "@images.yaml" when: branch: release-v2.1 ansible-arm64: - image: registry.cn-qingdao.aliyuncs.com/wod/ansible-kubernetes-image:v1.20.2 + image: registry.cn-qingdao.aliyuncs.com/wod/ansible-kubernetes-image:v1.20.6 pull: true dns: - 223.5.5.5 commands: - - cp -r ./ansible/main.yaml /etc/ansible/linux/main.yaml - - cd ansible - >- ansible-playbook /etc/ansible/linux/main.yaml --extra-vars '{ - "TARGET_ARCH":"arm64", - "TARGET_VERSION":"v2.1.3" + "REGISTRY_DATA_PATH": "/data/downloads/k8s/ansible/{{ TARGET_ARCH }}", + "REGISTRY_DATA_FILE": "images-harbor-{{ TARGET_VERSION }}.tar.gz", + "TARGET_ARCH":"arm64", + "TARGET_VERSION":"v2.1.3" }' --extra-vars "@images.yaml" when: branch: release-v2.1 ansible-ppc64le: - image: registry.cn-qingdao.aliyuncs.com/wod/ansible-kubernetes-image:v1.20.2 + image: registry.cn-qingdao.aliyuncs.com/wod/ansible-kubernetes-image:v1.20.6 pull: true dns: - 223.5.5.5 commands: - - cp -r ./ansible/main.yaml /etc/ansible/linux/main.yaml - - cd ansible - >- ansible-playbook /etc/ansible/linux/main.yaml --extra-vars '{ - "TARGET_ARCH":"ppc64le", - "TARGET_VERSION":"v2.1.3" + "REGISTRY_DATA_PATH": "/data/downloads/k8s/ansible/{{ TARGET_ARCH }}", + "REGISTRY_DATA_FILE": "images-harbor-{{ TARGET_VERSION }}.tar.gz", + "TARGET_ARCH":"ppc64le", + "TARGET_VERSION":"v2.1.3" }' --extra-vars "@images.yaml" when: diff --git a/.helmignore b/.helmignore index 13822e83071f60c5be866d2c492bd0dab1a2a97c..a59815eab6a5358320dedc91f806d83c973ddd98 100644 --- a/.helmignore +++ b/.helmignore @@ -4,7 +4,6 @@ docs/* CONTRIBUTING.md .travis.yaml test/* -ansible/* raws/* .beagle.yml CONTRIBUTING.md diff --git a/ansible/main.yaml b/ansible/main.yaml deleted file mode 100644 index 301c0aab3106804a63724398910f0f292e291e65..0000000000000000000000000000000000000000 --- a/ansible/main.yaml +++ /dev/null @@ -1,10 +0,0 @@ -- hosts: all - gather_facts: False - vars: - REGISTRY_DATA_PATH: '/data/downloads/k8s/registry/{{ TARGET_ARCH }}' - REGISTRY_DATA_FILE: "images-harbor-{{ TARGET_VERSION }}.tar.gz" - roles: - - role: wod.registry - - role: wod.registry-cache - CACHE_IMAGES: '{{ IMAGES }}' - - role: wod.tgz \ No newline at end of file