Skip to content

Commit

Permalink
Automated cherry pick of #1172: Fix winfv cleanup script (#1173)
Browse files Browse the repository at this point in the history
* Fix winfv cleanup script

- It needs secrets to access the AWS account
- It needs to cleanup the right CF stacks

* Bump winfv timeout to 40min
  • Loading branch information
lmm authored Oct 1, 2021
1 parent 27a5307 commit dc54834
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
4 changes: 3 additions & 1 deletion .semaphore/cleanup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ execution_time_limit:
global_job_config:
secrets:
- name: docker-hub
- name: banzai-secrets
prologue:
commands:
- echo $DOCKERHUB_PASSWORD | docker login --username "$DOCKERHUB_USERNAME" --password-stdin
Expand All @@ -35,7 +36,8 @@ blocks:
commands:
- git clone [email protected]:tigera/process.git
- aws ec2 delete-key-pair --key-name ${KEYPAIR_NAME} || true
- cd process/testing/winfv && NAME_PREFIX="${CLUSTER_NAME}" ./setup-fv.sh -q -u
- cd process/testing/winfv && NAME_PREFIX="${CLUSTER_NAME}-containerd" ./setup-fv.sh -q -u || true
- NAME_PREFIX="${CLUSTER_NAME}-docker" ./setup-fv.sh -q -u | true
env_vars:
- name: AWS_DEFAULT_REGION
value: us-west-2
Expand Down
4 changes: 2 additions & 2 deletions .semaphore/run-win-fv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ puttygen ${MASTER_CONNECT_KEY} -O private -o ${WIN_PPK_KEY}
chmod 600 $WIN_PPK_KEY
aws ec2 import-key-pair --key-name ${KEYPAIR_NAME} --public-key-material file://${MASTER_CONNECT_KEY_PUB}

# Set up the cluster.
# Set up the cluster. Set FV timeout to 40 minutes.
NAME_PREFIX="$CLUSTER_NAME" KUBE_VERSION="$K8S_VERSION" WINDOWS_KEYPAIR_NAME="$KEYPAIR_NAME" \
WINDOWS_PEM_FILE="$MASTER_CONNECT_KEY" WINDOWS_PPK_FILE="$WIN_PPK_KEY" WINDOWS_OS="Windows1809container" \
CONTAINER_RUNTIME="$CONTAINER_RUNTIME" ./setup-fv.sh -q | tee fv.log
CONTAINER_RUNTIME="$CONTAINER_RUNTIME" FV_TIMEOUT=2400 ./setup-fv.sh -q | tee fv.log

# Run FV
MASTER_IP=$(grep ubuntu@ fv.log | cut -d '@' -f2)
Expand Down

0 comments on commit dc54834

Please sign in to comment.