Skip to content

Commit 9b9e028

Browse files
committed
Fix an issue with deprecated cli config used in CI
[noissue]
1 parent 96cb487 commit 9b9e028

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

.ci/scripts/pulp_ansible/setup.sh

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,13 @@ if [ -z "$(pip freeze | grep pulp-cli)" ]; then
99
fi
1010

1111
# Set up CLI config file
12-
if [ ! -f ~/.config/pulp/settings.toml ]; then
13-
echo "Configuring pulp-cli"
14-
mkdir -p ~/.config/pulp
15-
cat > ~/.config/pulp/cli.toml << EOF
12+
echo "Configuring pulp-cli"
13+
mkdir -p ~/.config/pulp
14+
cat > ~/.config/pulp/cli.toml << EOF
1615
[cli]
1716
base_url = "$BASE_ADDR"
1817
verify_ssl = false
1918
format = "json"
2019
username = "admin"
2120
password = "password"
2221
EOF
23-
fi

.ci/scripts/pulp_tests.sh

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,20 +42,16 @@ echo $BASE_ADDR
4242
# https://github.com/pulp/pulp-operator/actions/runs/4238998943/jobs/7366637198#step:15:37
4343
pip install pulp-cli
4444

45-
if [ ! -f ~/.config/pulp/settings.toml ]; then
46-
echo "Configuring pulp-cli"
47-
mkdir -p ~/.config/pulp
48-
cat > ~/.config/pulp/cli.toml << EOF
45+
echo "Configuring pulp-cli"
46+
mkdir -p ~/.config/pulp
47+
cat > ~/.config/pulp/cli.toml << EOF
4948
[cli]
5049
base_url = "$BASE_ADDR"
5150
verify_ssl = false
5251
format = "json"
5352
username = "admin"
5453
password = "password"
5554
EOF
56-
fi
57-
58-
cat ~/.config/pulp/cli.toml | tee ~/.config/pulp/settings.toml
5955

6056
pulp status | jq
6157

0 commit comments

Comments
 (0)