diff --git a/build/images/inspect.sh b/build/images/inspect.sh index ea2487232..62c9ebfee 100755 --- a/build/images/inspect.sh +++ b/build/images/inspect.sh @@ -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 diff --git a/docker/index.yaml b/docker/index.yaml index 15144422f..4038acc0e 100644 --- a/docker/index.yaml +++ b/docker/index.yaml @@ -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 diff --git a/lib/setup-nexus.sh b/lib/setup-nexus.sh index 547b84f8a..f61b0e3db 100755 --- a/lib/setup-nexus.sh +++ b/lib/setup-nexus.sh @@ -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 diff --git a/release.sh b/release.sh index 2698aaa06..3a9b2e710 100755 --- a/release.sh +++ b/release.sh @@ -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\") |