From 3f5e5d55f00fb63320b59ce1fff5054d0188afba Mon Sep 17 00:00:00 2001 From: Egor Vasilyev Date: Wed, 29 May 2024 10:45:01 +0300 Subject: [PATCH 1/8] ci: Use custom docker image for tests --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 15d9c10..029f99e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -42,7 +42,7 @@ jobs: strategy: fail-fast: false matrix: - scenario: ${{ fromJson(needs.prepare-matrix.outputs.molecule-scenarios) }} + scenario: [default] # ${{ fromJson(needs.prepare-matrix.outputs.molecule-scenarios) }} name: "Run tests" # cgroup version shouldn't be cgroup2fs, check: # stat -c %T -f /sys/fs/cgroup From dbf49c8f273e79662130cabb6e121d93564d493e Mon Sep 17 00:00:00 2001 From: Egor Vasilyev Date: Wed, 29 May 2024 11:24:14 +0300 Subject: [PATCH 2/8] add debug --- .github/workflows/tests.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 029f99e..212f944 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -62,3 +62,8 @@ jobs: env: PY_COLORS: '1' ANSIBLE_FORCE_COLOR: '1' + + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 + with: + limit-access-to-actor: false From 9c6b086317754e4e53b322ba6ffd2fea75aee6fe Mon Sep 17 00:00:00 2001 From: Egor Vasilyev Date: Wed, 29 May 2024 13:32:59 +0300 Subject: [PATCH 3/8] switch to converge --- .github/workflows/tests.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 212f944..0566e3e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -46,7 +46,8 @@ jobs: name: "Run tests" # cgroup version shouldn't be cgroup2fs, check: # stat -c %T -f /sys/fs/cgroup - runs-on: ubuntu-20.04 + #runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 @@ -58,7 +59,7 @@ jobs: make init - name: Run tests run: | - molecule test --scenario-name "${{ matrix.scenario }}" + molecule converge --scenario-name "${{ matrix.scenario }}" env: PY_COLORS: '1' ANSIBLE_FORCE_COLOR: '1' From 3e268f83698603e207a9494fa423387450d1f421 Mon Sep 17 00:00:00 2001 From: Egor Vasilyev Date: Wed, 29 May 2024 14:53:10 +0300 Subject: [PATCH 4/8] switch debug --- .github/workflows/tests.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0566e3e..da8398e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -57,14 +57,15 @@ jobs: - name: Install requirements run: | make init + + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 + with: + limit-access-to-actor: false + - name: Run tests run: | molecule converge --scenario-name "${{ matrix.scenario }}" env: PY_COLORS: '1' ANSIBLE_FORCE_COLOR: '1' - - - name: Setup tmate session - uses: mxschmitt/action-tmate@v3 - with: - limit-access-to-actor: false From 7c57319383b2a906ebafb4403a42f58c0ad0d39f Mon Sep 17 00:00:00 2001 From: Egor Vasilyev Date: Fri, 31 May 2024 15:38:39 +0300 Subject: [PATCH 5/8] switch to new docker image --- molecule/default/molecule.yml | 2 +- molecule/default_ext-etcd-sec/molecule.yml | 2 +- molecule/default_join-workers/molecule.yml | 2 +- molecule/default_multi-master/molecule.yml | 2 +- molecule/end-to-end/molecule.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index e3f442e..ab4b817 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -7,7 +7,7 @@ driver: platforms: - name: k8s-control-plane-01 hostname: k8s-control-plane-01 - image: kindest/node:v1.26.3 + image: bissquit/my-kind:v0.1.1 # kindest/node:v1.26.3 groups: - etcd - control_plane diff --git a/molecule/default_ext-etcd-sec/molecule.yml b/molecule/default_ext-etcd-sec/molecule.yml index c36b94a..4efc1f6 100644 --- a/molecule/default_ext-etcd-sec/molecule.yml +++ b/molecule/default_ext-etcd-sec/molecule.yml @@ -8,7 +8,7 @@ platforms: - &default_k8s_platform name: k8s-control-plane-01 hostname: k8s-control-plane-01 - image: kindest/node:v1.26.3 + image: bissquit/my-kind:v0.1.1 # kindest/node:v1.26.3 groups: - control_plane volumes: diff --git a/molecule/default_join-workers/molecule.yml b/molecule/default_join-workers/molecule.yml index d85959f..eefee41 100644 --- a/molecule/default_join-workers/molecule.yml +++ b/molecule/default_join-workers/molecule.yml @@ -8,7 +8,7 @@ platforms: - &default_platform name: k8s-control-plane-01 hostname: k8s-control-plane-01 - image: kindest/node:v1.26.3 + image: bissquit/my-kind:v0.1.1 # kindest/node:v1.26.3 groups: - control_plane volumes: diff --git a/molecule/default_multi-master/molecule.yml b/molecule/default_multi-master/molecule.yml index 91b498f..5820632 100644 --- a/molecule/default_multi-master/molecule.yml +++ b/molecule/default_multi-master/molecule.yml @@ -8,7 +8,7 @@ platforms: - &default_platform name: k8s-control-plane-01 hostname: k8s-control-plane-01 - image: kindest/node:v1.26.3 + image: bissquit/my-kind:v0.1.1 # kindest/node:v1.26.3 groups: - control_plane volumes: diff --git a/molecule/end-to-end/molecule.yml b/molecule/end-to-end/molecule.yml index d3e0674..e5f3380 100644 --- a/molecule/end-to-end/molecule.yml +++ b/molecule/end-to-end/molecule.yml @@ -54,7 +54,7 @@ platforms: - &default_platform name: k8s-control-plane-01 hostname: k8s-control-plane-01 - image: kindest/node:v1.26.3 + image: bissquit/my-kind:v0.1.1 # kindest/node:v1.26.3 groups: - control_plane - etcd_clients From 310291ea71e65c21bb08fcff172f067f73ac7211 Mon Sep 17 00:00:00 2001 From: Egor Vasilyev Date: Fri, 31 May 2024 15:39:14 +0300 Subject: [PATCH 6/8] temporary disable debug --- .github/workflows/tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index da8398e..8886828 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -58,10 +58,10 @@ jobs: run: | make init - - name: Setup tmate session - uses: mxschmitt/action-tmate@v3 - with: - limit-access-to-actor: false +# - name: Setup tmate session +# uses: mxschmitt/action-tmate@v3 +# with: +# limit-access-to-actor: false - name: Run tests run: | From 94e86e683f42593d899e7f61b438df63eef513c1 Mon Sep 17 00:00:00 2001 From: Egor Vasilyev Date: Fri, 31 May 2024 15:42:52 +0300 Subject: [PATCH 7/8] fix install python command --- molecule/configure-k8s-instances.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/molecule/configure-k8s-instances.yml b/molecule/configure-k8s-instances.yml index 5a61b4b..f1602b5 100644 --- a/molecule/configure-k8s-instances.yml +++ b/molecule/configure-k8s-instances.yml @@ -1,7 +1,8 @@ --- - name: Install Python - ansible.builtin.raw: apt update && apt install -y python3-pip python3 python3-apt + ansible.builtin.raw: | + apt update && apt install -yq --no-install-recommends python3 python3-pip python3-apt changed_when: false - name: Install prerequisites From 613f17df588eb6b2fa619375000cd588b3ed67b1 Mon Sep 17 00:00:00 2001 From: Egor Vasilyev Date: Fri, 31 May 2024 16:22:06 +0300 Subject: [PATCH 8/8] uncomment debug --- .github/workflows/tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8886828..da8398e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -58,10 +58,10 @@ jobs: run: | make init -# - name: Setup tmate session -# uses: mxschmitt/action-tmate@v3 -# with: -# limit-access-to-actor: false + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 + with: + limit-access-to-actor: false - name: Run tests run: |