Skip to content
This repository has been archived by the owner on May 28, 2024. It is now read-only.

Commit

Permalink
test: bare PLATFORM uses aws bare instance to run test
Browse files Browse the repository at this point in the history
Signed-off-by: Xiaofeng Wang <[email protected]>
  • Loading branch information
henrywang committed Apr 21, 2024
1 parent 14e79dd commit 89de44c
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
7 changes: 6 additions & 1 deletion os-replace.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,12 @@ INSTALL_CONTAINERFILE="$LAYERED_DIR/Containerfile"
UPGRADE_CONTAINERFILE=${TEMPDIR}/Containerfile.upgrade
QUAY_REPO_TAG="${QUAY_REPO_TAG:-$(tr -dc a-z0-9 < /dev/urandom | head -c 4 ; echo '')}"
INVENTORY_FILE="${TEMPDIR}/inventory"
AWS_BARE="${AWS_BARE-false}"
AWS_BARE="${AWS_BARE-False}"

# bare PLATFORM uses aws bare instance
if [[ "$PLATFORM" == bare ]]; then
PLATFORM="aws"
fi

greenprint "Login quay.io"
podman login -u "${QUAY_USERNAME}" -p "${QUAY_PASSWORD}" quay.io
Expand Down
4 changes: 2 additions & 2 deletions playbooks/deploy-aws.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@
random_instance_type: "c5n.metal"
spot_max_price: "1.5"
when:
- aws_bare | default('') == "true" and arch == "x86_64"
- aws_bare | default('') == "True" and arch == "x86_64"

- name: set random instance type to a fixed value for aarch64 bare test
set_fact:
random_instance_type: "c6g.metal"
spot_max_price: "1.0"
when:
- aws_bare | default('') == "true" and arch == "aarch64"
- aws_bare | default('') == "True" and arch == "aarch64"

- name: get virtqe subnet
shell: |
Expand Down
2 changes: 1 addition & 1 deletion tmt/plans/os-replace.fmf
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ execute:
environment+:
PLATFORM: aws
LAYERED_IMAGE: cloud-init
AWS_BARE: true
AWS_BARE: True
prepare+:
- how: shell
script: curl "https://awscli.amazonaws.com/awscli-exe-linux-$(uname -m).zip" -o "awscliv2.zip" && unzip awscliv2.zip && ./aws/install
Expand Down

0 comments on commit 89de44c

Please sign in to comment.