Skip to content

Commit b79ba76

Browse files
committed
moar-fixes
Signed-off-by: Rafa Porres Molina <rporresm@redhat.com>
1 parent 31c6d75 commit b79ba76

3 files changed

Lines changed: 6 additions & 14 deletions

File tree

scripts/infrastructure/provision_landing_zone.sh

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ echo ""
7676
# Create working directory
7777
info "Creating working directory: $LZ_WORKING_DIR"
7878
sudo mkdir -p "$LZ_WORKING_DIR"
79-
sudo chown $USER:$USER "$LZ_WORKING_DIR"
79+
sudo chown "$USER":"$USER" "$LZ_WORKING_DIR"
8080

8181
# Copy cloud image from cache or download
8282
# Each job gets its own copy to avoid I/O conflicts during parallel execution
@@ -88,7 +88,7 @@ elif [[ "$CLOUD_IMAGE_URL" == file://* ]]; then
8888
cp "${CLOUD_IMAGE_URL#file://}" "${LZ_WORKING_DIR}/${CLOUD_IMAGE_NAME}"
8989
else
9090
info "Downloading cloud image: ${CLOUD_IMAGE_NAME}..."
91-
wget -nv -O "${LZ_WORKING_DIR}/${CLOUD_IMAGE_NAME}" "$CLOUD_IMAGE_URL"
91+
curl -fL --progress-bar -o "${LZ_WORKING_DIR}/${CLOUD_IMAGE_NAME}" "$CLOUD_IMAGE_URL"
9292
fi
9393
info "✓ Cloud image ready"
9494

@@ -113,17 +113,9 @@ users:
113113
hostname: enclave-lz
114114
fqdn: enclave-lz.${CLUSTER_DOMAIN:-enclave-test.lab}
115115
116-
packages:
117-
- git
118-
- vim
119-
- curl
120-
- wget
121-
- jq
122-
- python3
123-
- python3-pip
124-
- ansible-core
125-
126116
runcmd:
117+
- subscription-manager repos --list 2>/dev/null | awk '/Repo ID:/{print $3}' | grep -i appstream | xargs -r subscription-manager repos --enable 2>/dev/null || true
118+
- dnf install -y git
127119
- systemctl disable cloud-init
128120
- touch /etc/cloud/cloud-init.disabled
129121

scripts/runners/install_runner_ci_requirements.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ info "Step 2: Installing core system tools"
7575
sudo dnf install -y \
7676
git \
7777
curl \
78-
wget \
7978
vim \
8079
make \
8180
tar \
@@ -107,7 +106,7 @@ else
107106
warning "shellcheck not available in repos, installing via binary..."
108107
# Install shellcheck from GitHub releases
109108
SHELLCHECK_VERSION="v0.10.0"
110-
wget -qO- "https://github.com/koalaman/shellcheck/releases/download/${SHELLCHECK_VERSION}/shellcheck-${SHELLCHECK_VERSION}.linux.x86_64.tar.xz" | tar -xJv
109+
curl -fsSL "https://github.com/koalaman/shellcheck/releases/download/${SHELLCHECK_VERSION}/shellcheck-${SHELLCHECK_VERSION}.linux.x86_64.tar.xz" | tar -xJv
111110
sudo cp "shellcheck-${SHELLCHECK_VERSION}/shellcheck" /usr/local/bin/
112111
rm -rf "shellcheck-${SHELLCHECK_VERSION}"
113112
success "shellcheck installed from binary"

setup_env.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ dnf install -y \
77
awscli2 \
88
bind-utils \
99
curl \
10+
jq \
1011
httpd \
1112
httpd-tools \
1213
ipcalc \

0 commit comments

Comments
 (0)