From bc1d285fdcfff58b56bcf16e2fab33486df4e467 Mon Sep 17 00:00:00 2001 From: EKbfh Date: Wed, 30 Mar 2022 22:21:09 +0300 Subject: [PATCH 1/4] Add proper vars --- ansible/molecule/ubuntu20/molecule.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/molecule/ubuntu20/molecule.yml b/ansible/molecule/ubuntu20/molecule.yml index 52c806944c..40b359d341 100644 --- a/ansible/molecule/ubuntu20/molecule.yml +++ b/ansible/molecule/ubuntu20/molecule.yml @@ -42,7 +42,7 @@ provisioner: destroy: ../yc/destroy.yml options: i: inv.yml - extra-vars: tower_dist_dir=/tmp noc_version=${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME:-"master"} noc_py3_ver=${PY3_VERSION} + extra-vars: tower_dist_dir=/tmp noc_version=${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME:-"master"} noc_py3_ver=${PY3_VERSION} http_proxy=${CI_PROXY} lint: name: ansible-lint scenario: -- GitLab From af844eb99559ed73e4f9fc2768e2aa952d99a71b Mon Sep 17 00:00:00 2001 From: EKbfh Date: Wed, 30 Mar 2022 22:34:48 +0300 Subject: [PATCH 2/4] Add registry fix --- ansible/molecule/yc/templates/template.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/molecule/yc/templates/template.tf b/ansible/molecule/yc/templates/template.tf index 08b3051254..915cad7092 100644 --- a/ansible/molecule/yc/templates/template.tf +++ b/ansible/molecule/yc/templates/template.tf @@ -1,7 +1,7 @@ terraform { required_providers { yandex = { - source = "terraform-providers/yandex" + source = "terraform-registry.storage.yandexcloud.net/yandex-cloud/yandex" } } } -- GitLab From beb2fc553cba13794c38ba1395e469e973ab57c5 Mon Sep 17 00:00:00 2001 From: EKbfh Date: Wed, 30 Mar 2022 23:14:52 +0300 Subject: [PATCH 3/4] Add var fix --- ansible/molecule/debian10/molecule.yml | 2 +- ansible/molecule/debian11/molecule.yml | 2 +- ansible/molecule/debian9/molecule.yml | 2 +- ansible/molecule/default/molecule.yml | 2 +- ansible/molecule/oel7/molecule.yml | 2 +- ansible/molecule/ubuntu16/molecule.yml | 2 +- ansible/molecule/ubuntu18/molecule.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ansible/molecule/debian10/molecule.yml b/ansible/molecule/debian10/molecule.yml index 0b9a30e02d..d42538cb3d 100644 --- a/ansible/molecule/debian10/molecule.yml +++ b/ansible/molecule/debian10/molecule.yml @@ -42,7 +42,7 @@ provisioner: destroy: ../yc/destroy.yml options: i: inv.yml - extra-vars: tower_dist_dir=/tmp noc_version=${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME:-"master"} noc_py3_ver=${PY3_VERSION} + extra-vars: tower_dist_dir=/tmp noc_version=${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME:-"master"} noc_py3_ver=${PY3_VERSION} http_proxy=${CI_PROXY} lint: name: ansible-lint scenario: diff --git a/ansible/molecule/debian11/molecule.yml b/ansible/molecule/debian11/molecule.yml index 6c38a3dce2..5d2120d5ed 100644 --- a/ansible/molecule/debian11/molecule.yml +++ b/ansible/molecule/debian11/molecule.yml @@ -42,7 +42,7 @@ provisioner: destroy: ../yc/destroy.yml options: i: inv.yml - extra-vars: tower_dist_dir=/tmp noc_version=${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME:-"master"} noc_py3_ver=${PY3_VERSION} + extra-vars: tower_dist_dir=/tmp noc_version=${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME:-"master"} noc_py3_ver=${PY3_VERSION} http_proxy=${CI_PROXY} lint: name: ansible-lint scenario: diff --git a/ansible/molecule/debian9/molecule.yml b/ansible/molecule/debian9/molecule.yml index acc105d60f..900cfc1712 100644 --- a/ansible/molecule/debian9/molecule.yml +++ b/ansible/molecule/debian9/molecule.yml @@ -42,7 +42,7 @@ provisioner: destroy: ../yc/destroy.yml options: i: inv.yml - extra-vars: tower_dist_dir=/tmp noc_version=${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME:-"master"} noc_py3_ver=${PY3_VERSION} + extra-vars: tower_dist_dir=/tmp noc_version=${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME:-"master"} noc_py3_ver=${PY3_VERSION} http_proxy=${CI_PROXY} lint: name: ansible-lint scenario: diff --git a/ansible/molecule/default/molecule.yml b/ansible/molecule/default/molecule.yml index 5710e4530f..7c513c001d 100644 --- a/ansible/molecule/default/molecule.yml +++ b/ansible/molecule/default/molecule.yml @@ -42,7 +42,7 @@ provisioner: destroy: ../yc/destroy.yml options: i: inv.yml - extra-vars: tower_dist_dir=/tmp noc_version=${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME:-"master"} noc_py3_ver=${PY3_VERSION} + extra-vars: tower_dist_dir=/tmp noc_version=${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME:-"master"} noc_py3_ver=${PY3_VERSION} http_proxy=${CI_PROXY} lint: name: ansible-lint scenario: diff --git a/ansible/molecule/oel7/molecule.yml b/ansible/molecule/oel7/molecule.yml index 5bd3ebbe9a..dfe9db73ea 100644 --- a/ansible/molecule/oel7/molecule.yml +++ b/ansible/molecule/oel7/molecule.yml @@ -44,7 +44,7 @@ provisioner: destroy: ../common/destroy.yml options: i: inv.yml - extra-vars: tower_dist_dir=/tmp noc_version=${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME:-"master"} noc_py3_ver=${PY3_VERSION} + extra-vars: tower_dist_dir=/tmp noc_version=${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME:-"master"} noc_py3_ver=${PY3_VERSION} http_proxy=${CI_PROXY} lint: name: ansible-lint scenario: diff --git a/ansible/molecule/ubuntu16/molecule.yml b/ansible/molecule/ubuntu16/molecule.yml index 93110a6199..e1357b8f6f 100644 --- a/ansible/molecule/ubuntu16/molecule.yml +++ b/ansible/molecule/ubuntu16/molecule.yml @@ -42,7 +42,7 @@ provisioner: destroy: ../yc/destroy.yml options: i: inv.yml - extra-vars: tower_dist_dir=/tmp noc_version=${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME:-"master"} noc_py3_ver=${PY3_VERSION} + extra-vars: tower_dist_dir=/tmp noc_version=${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME:-"master"} noc_py3_ver=${PY3_VERSION} http_proxy=${CI_PROXY} lint: name: ansible-lint scenario: diff --git a/ansible/molecule/ubuntu18/molecule.yml b/ansible/molecule/ubuntu18/molecule.yml index 8604705f35..9e4eed8796 100644 --- a/ansible/molecule/ubuntu18/molecule.yml +++ b/ansible/molecule/ubuntu18/molecule.yml @@ -42,7 +42,7 @@ provisioner: destroy: ../yc/destroy.yml options: i: inv.yml - extra-vars: tower_dist_dir=/tmp noc_version=${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME:-"master"} noc_py3_ver=${PY3_VERSION} + extra-vars: tower_dist_dir=/tmp noc_version=${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME:-"master"} noc_py3_ver=${PY3_VERSION} http_proxy=${CI_PROXY} lint: name: ansible-lint scenario: -- GitLab From 1ade7c0c55650936c3af42c878325b69bb3ea762 Mon Sep 17 00:00:00 2001 From: EKbfh Date: Thu, 31 Mar 2022 12:42:05 +0300 Subject: [PATCH 4/4] Comment out centos7 due postgres 9.6 --- ansible/.ansible-ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ansible/.ansible-ci.yml b/ansible/.ansible-ci.yml index a4e78290d5..29e1068904 100644 --- a/ansible/.ansible-ci.yml +++ b/ansible/.ansible-ci.yml @@ -55,14 +55,14 @@ lint_ansible: - if: '$CI_PIPELINE_SOURCE == "web" && $CHECK_DEPLOY == "true"' - if: '$CI_PIPELINE_SOURCE == "schedule" && $CHECK_DEPLOY == "true"' -build_centos7: - extends: .base_builder - variables: - PKG_CACHE: /var/cache/yum - SCENARIO_NAME: default - tags: - - cloud - - docker +#build_centos7: +# extends: .base_builder +# variables: +# PKG_CACHE: /var/cache/yum +# SCENARIO_NAME: default +# tags: +# - cloud +# - docker # build_centos8: # extends: .base_builder -- GitLab