Skip to content

Commit 398b153

Browse files
committed
Merge branch 'bugfix/bump-terraform-snashots' into tmp/octopus/w/130.0/bugfix/bump-terraform-snashots
2 parents c4df491 + fce82e5 commit 398b153

File tree

7 files changed

+24
-14
lines changed

7 files changed

+24
-14
lines changed

.github/actions/bastion-tests/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ runs:
4040
NODE: bastion
4141
COMMAND: |
4242
cd metalk8s
43-
export SSH_CONFIG_FILE=\"/home/centos/ssh_config\"
43+
export SSH_CONFIG_FILE=\"/home/rocky/ssh_config\"
4444
export ISO_MOUNTPOINT=\"${{ inputs.mountpoint || steps.metalk8s_mountpoint.outputs.mountpoint }}\"
4545
export BOOTSTRAP_BACKUP_ARCHIVE=\"${{ inputs.BOOTSTRAP_BACKUP_ARCHIVE }}\"
4646
export CONTROL_PLANE_INGRESS_VIP=\"${{ inputs.CONTROL_PLANE_INGRESS_VIP }}\"

.github/actions/bastion-ui-tests/action.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,8 @@ runs:
2323
with:
2424
NODE: bastion
2525
COMMAND: |
26-
sudo yum clean all
27-
sudo yum install -y epel-release
28-
sudo yum -y update
29-
sudo yum install -y chromium
26+
sudo dnf install -y epel-release
27+
sudo dnf install -y chromium
3028
3129
- name: Run UI tests from Bastion
3230
uses: ./.github/actions/run-command-ssh

.github/actions/destroy-cluster/action.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ inputs:
1717
TERRAFORM_VERSION:
1818
description: "Terraform version to use"
1919
required: false
20-
default: "1.8.2"
20+
default: "1.11.4"
2121
TERRAFORM_SNAPSHOT_TAG:
2222
description: "Tag to checkout for the scality/terraform-snapshot repository"
2323
required: false
24-
default: "0.17.0"
24+
default: "0.18.0"
2525

2626
# Cloud configuration
2727
CLOUD:

.github/actions/prepare-bastion/action.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,13 @@ inputs:
1414
runs:
1515
using: "composite"
1616
steps:
17+
- name: Install git and tox on bastion
18+
uses: ./.github/actions/run-command-ssh
19+
with:
20+
NODE: bastion
21+
COMMAND: |
22+
sudo dnf install -y git python3-pip
23+
pip3 install --user tox
1724
- name: Clone MetalK8s repository on Bastion
1825
uses: ./.github/actions/run-command-ssh
1926
with:

.github/actions/spawn-cluster/action.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ inputs:
1717
TERRAFORM_VERSION:
1818
description: "Terraform version to use"
1919
required: false
20-
default: "1.8.2"
20+
default: "1.11.4"
2121
TERRAFORM_SNAPSHOT_TAG:
2222
description: "Tag to checkout for the scality/terraform-snapshot repository"
2323
required: false
24-
default: "0.17.0"
24+
default: "0.18.0"
2525

2626
# Cloud configuration
2727
CLOUD:

.github/workflows/single-node-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ jobs:
247247
export DEST_DIR="artifacts/ui-e2e-tests/${{ github.job }}"
248248
mkdir -p ${DEST_DIR}
249249
scp -F ssh_config \
250-
"bastion:/home/centos/metalk8s/ui/cypress/videos/e2e/*" \
250+
"bastion:metalk8s/ui/cypress/videos/e2e/*" \
251251
"${DEST_DIR}/"
252252
253253
- name: Generate and Collect sosreport

ui/cypress/requirements.sh

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
# This script is designed to run on RHEL/CentOS with `sudo` installed
3+
# This script is designed to run on RHEL/Rocky with `sudo` installed
44
# Mainly used in the CI
55

66
if ! [ -f /etc/redhat-release ]; then
@@ -10,9 +10,8 @@ fi
1010

1111
set -xue -o pipefail
1212

13-
YUM_OPTS=(
13+
DNF_OPTS=(
1414
--assumeyes
15-
--setopt 'skip_missing_names_on_install=False'
1615
)
1716
NPM_OPTS=(
1817
--no-save
@@ -37,7 +36,13 @@ NODE_PACKAGES=(
3736

3837
curl -sL https://rpm.nodesource.com/setup_16.x | sudo bash -
3938

40-
sudo yum install "${YUM_OPTS[@]}" "${RPM_PACKAGES[@]}"
39+
# NOTE: We have to set the crypto policies to SHA1 because of the
40+
# outdated version of nodejs
41+
sudo update-crypto-policies --set DEFAULT:SHA1
42+
43+
sudo dnf install "${DNF_OPTS[@]}" "${RPM_PACKAGES[@]}"
44+
45+
sudo update-crypto-policies --set DEFAULT
4146

4247
npm install "${NPM_OPTS[@]}" "${NODE_PACKAGES[@]}"
4348

0 commit comments

Comments
 (0)