Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on: [push, pull_request]
jobs:
flake8:
name: run flake8
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: set up python 3.11
uses: actions/setup-python@v2
Expand All @@ -23,7 +23,7 @@ jobs:

black:
name: run black
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: set up python 3.11
uses: actions/setup-python@v2
Expand All @@ -41,7 +41,7 @@ jobs:

bandit:
name: run bandit
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: set up python 3.11
uses: actions/setup-python@v2
Expand All @@ -56,4 +56,3 @@ jobs:

- name: run bandit security checks
run: tox -e bandit

5 changes: 2 additions & 3 deletions .github/workflows/merge-main-to-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,17 @@ on:

jobs:
merge-main-to-develop:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- run: .github/scripts/merge-main-to-develop.sh
tag-latest:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: merge-main-to-develop
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- run: .github/scripts/tag-latest.sh

4 changes: 2 additions & 2 deletions .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on: [push, pull_request]
jobs:
coverage:
name: code coverage check
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- name: set up python 3.11
Expand Down Expand Up @@ -42,7 +42,7 @@ jobs:

pytest:
name: pytest
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- name: set up python 3.11
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ on:
workflow_dispatch:
inputs:
tag_or_release:
description: 'must be string of either "tag" or "release"'
description: 'must be string of either "tag" or "release"'
required: true
default: 'tag'
name:
description: 'the tag or release name, i.e. v1.0.0'
description: 'the tag or release name, i.e. v1.0.0'
required: true
source_branch:
description: 'the branch to tag or release'
Expand All @@ -16,7 +16,7 @@ on:

jobs:
tag_or_release:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
name: tag or release the given branch with the given name
steps:
- name: checkout
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tag-latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
update-latest-tag:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- run: .github/scripts/tag-latest.sh
2 changes: 1 addition & 1 deletion .github/workflows/tag-stable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
update-stable-tag:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- run: .github/scripts/tag-stable.sh
1 change: 0 additions & 1 deletion changelog.md
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
- update caldp version and changelog.md
- update base image in AMI rotation Dockerfile
7 changes: 4 additions & 3 deletions terraform/deploy_vars.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#! /bin/bash -xu
export CALCLOUD_VER="v0.4.46"
export CALDP_VER="v0.2.28"
export CAL_BASE_IMAGE="stsci/hst-pipeline:2025.2.1.4-photutils-py311"
export CALCLOUD_VER="v0.4.47"
export CALDP_VER="v0.2.29"
export CAL_BASE_IMAGE="stsci/hst-pipeline:2025.3.1.7-alignmentmatches-py311"

export BASE_IMAGE_TAG=`cut -d ":" -f2- <<< ${CAL_BASE_IMAGE} `

export COMMON_IMAGE_TAG="CALCLOUD_${CALCLOUD_VER}-CALDP_${CALDP_VER}-BASE_${BASE_IMAGE_TAG}"
Expand Down
8 changes: 4 additions & 4 deletions terraform/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,10 @@ variable crds_context {
description = "the crds context to be the default for the environment"
type = map(string)
default = {
"-sb" = "hst_1205.pmap"
"-dev" = "hst_1205.pmap"
"-test" = "hst_1211.pmap"
"-ops" = "hst_1211.pmap"
"-sb" = "hst_1241.pmap"
"-dev" = "hst_1241.pmap"
"-test" = "hst_1247.pmap"
"-ops" = "hst_1247.pmap"
}
}

Expand Down