Skip to content

Commit

Permalink
Merge pull request #273 from Cray-HPE/develop
Browse files Browse the repository at this point in the history
Release 2.17.0 - BOS v1 removal
  • Loading branch information
mharding-hpe authored Mar 15, 2024
2 parents 678278a + 1f04b9b commit c887f4f
Show file tree
Hide file tree
Showing 41 changed files with 227 additions and 5,140 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [2.17.0] - 2024-03-15
### Dependencies
- Use appropriate version of `kubernetes` Python module to match CSM 1.6 Kubernetes version

### Removed
- BOS v1

## [2.16.0] - 2024-03-15
### Changed
- Install uWSGI using `apk` instead of `pip`; update uWSGI config file to point to Python virtualenv
Expand Down
11 changes: 4 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -62,18 +62,15 @@ RUN apk add --upgrade --no-cache apk-tools busybox && \
ENV VIRTUAL_ENV=/app/venv
RUN python3 -m venv $VIRTUAL_ENV
ENV PATH="$VIRTUAL_ENV/bin:$PATH"
RUN pip3 install --no-cache-dir -U pip
RUN pip3 install --no-cache-dir -U pip -c constraints.txt
RUN --mount=type=secret,id=netrc,target=/root/.netrc pip3 install --no-cache-dir -r requirements.txt
RUN cd lib && pip3 install --no-cache-dir .
RUN cd lib && pip3 install --no-cache-dir . -c ../constraints.txt

# Testing image
# Base testing image
FROM base as testing
WORKDIR /app
COPY docker_test_entry.sh .
COPY test-requirements.txt .
RUN apk add --no-cache --repository https://arti.hpc.amslabs.hpecorp.net/artifactory/mirror-alpine/edge/testing/ etcd etcd-ctl
RUN --mount=type=secret,id=netrc,target=/root/.netrc cd /app && pip3 install --no-cache-dir -r test-requirements.txt
CMD [ "./docker_test_entry.sh" ]

# Codestyle reporting
FROM testing as codestyle
Expand Down Expand Up @@ -101,7 +98,7 @@ FROM intermediate as debug
ENV PYTHONPATH "/app/lib/server"
WORKDIR /app
RUN apk add --no-cache busybox-extras && \
pip3 install --no-cache-dir rpdb
pip3 install --no-cache-dir rpdb -c constraints.txt

# Application image
FROM intermediate as application
Expand Down
16 changes: 1 addition & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ nodes (Node Personalization) or Images (Image Customization).
* Boot -- Boot nodes that are off
* Reboot -- Gracefully power down nodes that are on and then power them back up
* Shutdown -- Gracefully power down nodes that are on
* Reconfigure -- Reconfigure the nodes using the Configuration Framework Service (CFS) (Currently, not supported.)
* Boot Set -- A collection of nodes that you want to perform an operation upon. It contains
* A list of nodes
* The following applies to booting or rebooting:
Expand All @@ -40,9 +39,7 @@ nodes (Node Personalization) or Images (Image Customization).
* `boot_sets`: One or more Boot Sets as described above
* `enable_cfs`: Whether to enable the Configuration Framework Service (CFS); Choices: true/false
* cfs: The configuration framework service configuration options to use for all boot sets that don't already define their own.
* Session -- Performs an Operation (action) on a Session Template. The creation of
a Session results in the creation of one or more Kubernetes BOA jobs which interact
with other Shasta subsystems to perform the requested operation.
* Session -- Performs an Operation (action) on a Session Template.

## Launching a Boot Session

Expand Down Expand Up @@ -148,17 +145,6 @@ $ cd $REPO
$ ./regenerate_server.sh
```

## Dependency: cray-boa

`cray-bos` uses the `cray-boa` image built by the [`boa`](https://github.com/Cray-HPE/boa) repository.
We specify which major and minor version of the image we want with the
[`update_external_versions.conf`](update_external_versions.conf) file.
At build time the [`runBuildPrep.sh`](runBuildPrep.sh) script calls a utility
which finds the latest version with that major and minor number.

When creating a new release branch, be sure to update this file to specify the
desired major and minor number of the image for the new release.

## Build Helpers

This repository uses some build helper scripts from the
Expand Down
Loading

0 comments on commit c887f4f

Please sign in to comment.