Skip to content

Commit

Permalink
CRAYSAT-1767: Download cray-sat image from csm-docker
Browse files Browse the repository at this point in the history
The cray-sat image now publishes to csm-docker, and this is where the
newer 3.0.0 version of cray-sat-podman expects it to be uploaded to
Nexus on the system. Make the following changes:

* Download cray-sat from csm-docker. This also has the side effect of
  uploading to the same path in Nexus upon installation
* Change code in `lib/setup-nexus.sh` to tag the image as `csm-latest`
  in its new location in Nexus
* Modify the `yq` command in `release.sh` that reads the `cray-sat`
  container image version from `docker/index.yaml`
* Remove harmless but now unnecessary condition on `sat-docker` path in
  `build/images/inspect.sh`

Test Description:
Tested the `yq` command independently to ensure it could still get the
version of `cray-sat`.
  • Loading branch information
haasken-hpe committed Oct 25, 2023
1 parent 75c0f2f commit 446d10b
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 10 deletions.
3 changes: 0 additions & 3 deletions build/images/inspect.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@ function resolve_mirror() {
if [[ "$image" == artifactory.algol60.net/csm-docker/stable/* ]]; then
# nothing needs to be changed
echo "${image}"
elif [[ "$image" == artifactory.algol60.net/sat-docker/stable/* ]]; then
# nothing needs to be changed
echo "${image}"
else
# docker.io/library/alpine:latest > artifactory.algol60.net/csm-docker/stable/docker.io/library/alpine:latest
# quay.io/skopeo/stable:v1.4.1 > artifactory.algol60.net/csm-docker/stable/quay.io/skopeo/stable:v1.4.1
Expand Down
10 changes: 5 additions & 5 deletions docker/index.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
# OTHER DEALINGS IN THE SOFTWARE.
#
artifactory.algol60.net/sat-docker/stable:
images:
cray-sat:
- 3.25.6

artifactory.algol60.net/csm-docker/stable:
images:
canu:
- 1.7.6

# cray-sat is not included in any Helm charts
cray-sat:
- 3.26.0

# XXX update-uas v1.4.0 should include these
cray-uai-sles15sp3:
- 1.4.0
Expand Down
2 changes: 1 addition & 1 deletion lib/setup-nexus.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ nexus-setup repositories "${ROOTDIR}/nexus-repositories.yaml"
skopeo-sync "${ROOTDIR}/docker"

# Tag SAT image as csm-latest
sat_image="artifactory.algol60.net/sat-docker/stable/cray-sat"
sat_image="artifactory.algol60.net/csm-docker/stable/cray-sat"
# This value is replaced by release.sh at CSM release distribution build time
sat_version="@SAT_VERSION@"
# This csm-latest tag is being phased out, but still used as a default
Expand Down
2 changes: 1 addition & 1 deletion release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ yq e "(.spec.charts[] | select(.name == \"cray-csm-barebones-recipe-install\") |

# Get the version of the cray-sat container image in this CSM build. There should
# only be one version, but if there is more than one, take the latest.
CRAY_SAT_VERSION="$(yq '."artifactory.algol60.net/sat-docker/stable".images.cray-sat[]' ${ROOTDIR}/docker/index.yaml | sort -Vr | head -n 1)"
CRAY_SAT_VERSION="$(yq '."artifactory.algol60.net/csm-docker/stable".images.cray-sat[]' ${ROOTDIR}/docker/index.yaml | sort -Vr | head -n 1)"

# Set cray-sat tag in csm-config Helm chart via the Loftsman manifest
yq e "(.spec.charts[] | select(.name == \"csm-config\") |
Expand Down

0 comments on commit 446d10b

Please sign in to comment.