diff --git a/changelog.md b/changelog.md index 91a4479..1e0de18 100644 --- a/changelog.md +++ b/changelog.md @@ -1,2 +1,2 @@ -- default base docker image set to CALDP_20230613_CAL_final -- default crds update to hst_1077.pmap +- default base docker image set to CALDP_cosandpin_CAL_rc1 +- default crds update to hst_1089.pmap diff --git a/terraform/deploy_vars.sh b/terraform/deploy_vars.sh index 7ad7f87..f13a652 100755 --- a/terraform/deploy_vars.sh +++ b/terraform/deploy_vars.sh @@ -1,8 +1,7 @@ #! /bin/bash -xu -export CALCLOUD_VER="ami-rotate-codebuild-v3" -export CALDP_VER="v0.2.22-rc3" -export CAL_BASE_IMAGE="stsci/hst-pipeline:CALDP_onlywfpc2drizzle_CAL_rc3" - +export CALCLOUD_VER="v0.4.41-rc1" +export CALDP_VER="v0.2.23-rc1" +export CAL_BASE_IMAGE="stsci/hst-pipeline:CALDP_cosandpin_CAL_rc1" export BASE_IMAGE_TAG=`cut -d ":" -f2- <<< ${CAL_BASE_IMAGE} ` export COMMON_IMAGE_TAG="CALCLOUD_${CALCLOUD_VER}-CALDP_${CALDP_VER}-BASE_${BASE_IMAGE_TAG}" @@ -10,7 +9,7 @@ export COMMON_IMAGE_TAG="CALCLOUD_${CALCLOUD_VER}-CALDP_${CALDP_VER}-BASE_${BASE # i.e. CALCLOUD_BUILD_DIR="$HOME/deployer/calcloud" # these can be set as environment variables before running to avoid changing the script directly # (and avoid accidentally committing a custom path to the repo...) -export CALCLOUD_BUILD_DIR=${CALCLOUD_BUILD_DIR:-""} +export CALCLOUD_BUILD_DIR=${CALCLOUD_BUILD_DIR:-""} export CALDP_BUILD_DIR=${CALDP_BUILD_DIR:-""} export TMP_INSTALL_DIR="/tmp/calcloud_install" diff --git a/terraform/variables.tf b/terraform/variables.tf index 48d0f64..0b021fa 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -116,8 +116,8 @@ variable crds_context { default = { "-sb" = "hst_1074.pmap" "-dev" = "hst_1074.pmap" - "-test" = "hst_1077.pmap" - "-ops" = "hst_1077.pmap" + "-test" = "hst_1089.pmap" + "-ops" = "hst_1089.pmap" } }