Skip to content

Commit

Permalink
Merge branch 'main' into feature/PENG-2585--ci-validation
Browse files Browse the repository at this point in the history
  • Loading branch information
zsinx6 committed Feb 13, 2025
2 parents 81aadbf + e215da8 commit 4288122
Show file tree
Hide file tree
Showing 8 changed files with 425 additions and 19 deletions.
14 changes: 0 additions & 14 deletions .github/workflows/build-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,13 @@ name: "Build image"

on:
workflow_call:
inputs:
jobbergate_version:
description: "The Jobbergate agent version"
required: false
type: string
default: "4.3.1"

push:
branches:
- main
pull_request:

workflow_dispatch:
inputs:
jobbergate_version:
description: The Jobbergate agent version
required: false
type: string
default: 4.3.1

jobs:
build-image-in-lxd:
Expand All @@ -36,7 +24,5 @@ jobs:
poetry install
- name: Build democluster
env:
JG_VERSION: ${{ github.event.inputs.jobbergate_version }}
run: |
poetry run image-factory build democluster
46 changes: 46 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,49 @@ jobs:
run: |
poetry run mypy image_factory --pretty
poetry run ruff check image_factory
synth-stack:
name: synth-stack
runs-on: ubuntu-24.04
steps:
- name: Check out code
uses: actions/checkout@v3

- uses: actions/setup-node@v4
with:
node-version: '22.8.0'

- name: Install Poetry
uses: Gr1N/setup-poetry@v8
with:
poetry-version: 1.8.3

- name: Set up Python
uses: actions/setup-python@v4
with:
cache: 'poetry'

- name: Install CDK
run: |
npm install -g [email protected]
- name: Cache cdk.out
uses: actions/cache@v4
with:
path: cdk.out
key: cdk-out

- name: Setup AWS credentials
uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: us-east-1

- name: Install Python packages
run: |
poetry install --with=website
- name: Publish the deploy script
run: |
cdk synth --path-metadata false --version-reporting false
2 changes: 0 additions & 2 deletions .github/workflows/test-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ jobs:
call-build-workflow:
name: call-build-workflow
uses: .github/workflows/build-image.yml
with:
jobbergate_version: "4.3.1"

validate-image:
name: copy-image
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,6 @@ output-*
*.fd
seeds-cloudimg.iso
*.tar.gz
*.img
*.img

cdk.out/
6 changes: 6 additions & 0 deletions cdk.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"app":"poetry run python3 ./website.py",
"context":{
"@aws-cdk/core:newStyleStackSynthesis":true
}
}
238 changes: 236 additions & 2 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 4288122

Please sign in to comment.