Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
127 commits
Select commit Hold shift + click to select a range
6c13134
Define resource limits, and adds tests in test_config
8ohamed Nov 16, 2025
8968d0c
test utils updated
8ohamed Nov 16, 2025
71a6250
added limits to compose files
8ohamed Nov 18, 2025
3e91a9e
added cpuset + resolved issues
8ohamed Nov 18, 2025
337b661
test issue
8ohamed Nov 18, 2025
ae7a39e
removed cpuset
8ohamed Nov 19, 2025
72a0dff
remove cpuset
8ohamed Nov 19, 2025
1166023
applies snake_case to tests
8ohamed Nov 19, 2025
a9311a6
resolves sonar issues
8ohamed Nov 19, 2025
a34b554
minor updates
8ohamed Nov 19, 2025
819e502
update pid limit in compose
8ohamed Nov 19, 2025
9b15119
changed pids_limit back
8ohamed Nov 20, 2025
d4e99f0
initial commit
8ohamed Nov 28, 2025
9a2c8cf
Merge branch 'INTO-CPS-Association:feature/distributed-demo' into fea…
8ohamed Nov 28, 2025
5d12713
test issue
8ohamed Nov 18, 2025
b9abf46
applies snake_case to tests
8ohamed Nov 19, 2025
ce3ff7e
resolves sonar issues
8ohamed Nov 19, 2025
f2efa23
minor updates
8ohamed Nov 19, 2025
47f3885
update pid limit in compose
8ohamed Nov 19, 2025
8e87d19
changed pids_limit back
8ohamed Nov 20, 2025
f6cc63a
initial commit
8ohamed Nov 28, 2025
5d15586
Merge branch 'feature/distributed-demo' of https://github.com/8ohamed…
8ohamed Nov 29, 2025
d76b287
minor fix
8ohamed Nov 29, 2025
6595acf
removed user arg
8ohamed Nov 30, 2025
3b4f545
refactors service_setup, updates readme
8ohamed Nov 30, 2025
0380b11
applies coding suggestions
8ohamed Nov 30, 2025
1317cc9
Handles windows OS
8ohamed Dec 1, 2025
3542676
applying suggestions
8ohamed Dec 1, 2025
4c9587f
applying suggestions
8ohamed Dec 1, 2025
dc2e4a5
minor updates
8ohamed Dec 1, 2025
ead2bb4
minor updates
8ohamed Dec 1, 2025
a85da0c
fixes bugs
8ohamed Dec 2, 2025
642a266
minor update
8ohamed Dec 2, 2025
bc04232
cli package structure
8ohamed Dec 5, 2025
b526804
Merge branch 'INTO-CPS-Association:feature/distributed-demo' into fea…
8ohamed Dec 5, 2025
73ec3d1
first implementation of services cli
8ohamed Dec 5, 2025
920a156
fixing the influxdb and rabbitmq adding user
8ohamed Dec 6, 2025
bdcf3c7
applying suggestions + using python-on-whales
8ohamed Dec 9, 2025
d7feb6c
more packging
8ohamed Dec 9, 2025
5ce2919
solves some style issues
8ohamed Dec 9, 2025
6a59696
wheel package
8ohamed Dec 9, 2025
624fb4b
less duplication + error handling for influxdb and rabbitmq
8ohamed Dec 9, 2025
f5021bf
refactor generate_project
8ohamed Dec 9, 2025
7833578
changing src to dtaas_services + making build script
8ohamed Dec 10, 2025
fe02464
refactoring setup.py
8ohamed Dec 11, 2025
c113381
minor fix
8ohamed Dec 11, 2025
f7f089d
minor updates
8ohamed Dec 11, 2025
f0a2556
Merge branch 'INTO-CPS-Association:feature/distributed-demo' into fea…
8ohamed Dec 13, 2025
98eabeb
minor fixes + update README
8ohamed Dec 17, 2025
0ff4710
minor fix
8ohamed Dec 17, 2025
567b189
removed user files and update gitignore
8ohamed Dec 18, 2025
cfb3c2a
Merge branch 'feature/distributed-demo' into feature/distributed-demo
8ohamed Dec 18, 2025
9fee633
minor update
8ohamed Dec 18, 2025
2a15775
Merge branch 'feature/distributed-demo' of https://github.com/8ohamed…
8ohamed Dec 18, 2025
65b3788
gitignore update
8ohamed Dec 18, 2025
9217d2f
fixes copy files
8ohamed Dec 18, 2025
dae8fe1
fix test
8ohamed Dec 18, 2025
bf58233
copies workflow from 1377 PR
8ohamed Dec 21, 2025
03424d6
copies doc from PR 1377
8ohamed Dec 21, 2025
de7d468
modifies setup command
8ohamed Dec 21, 2025
27f77c9
excluded user config and runtime data when coping files
8ohamed Dec 21, 2025
8eb7f2c
fixes user add issues
8ohamed Dec 21, 2025
1e54099
adds service remove command
8ohamed Dec 21, 2025
3acf1c5
small change to remove command + update codecov
8ohamed Dec 22, 2025
252cdff
using rich format
8ohamed Dec 22, 2025
c94ddaa
improves test coverage
8ohamed Dec 22, 2025
3416e90
minor fix
8ohamed Dec 22, 2025
8494e94
minor updates to workflow files
8ohamed Dec 22, 2025
1a79368
minor updates + created template.py
8ohamed Dec 22, 2025
9e93582
removed read from outside the job level
8ohamed Dec 23, 2025
5b9ee08
minor fix
8ohamed Dec 23, 2025
c8858dd
Merge branch 'feature/distributed-demo' into feature/distributed-demo
8ohamed Dec 23, 2025
3940572
fix to yml file
8ohamed Dec 23, 2025
f965d31
remove -v command now removes old data dir
8ohamed Dec 23, 2025
b9ffb99
updates reusable yml
8ohamed Dec 24, 2025
de91796
fixes some pylint issues
8ohamed Dec 24, 2025
433624e
uses the full hash
8ohamed Dec 24, 2025
7095762
small fix
8ohamed Dec 24, 2025
3baaa9a
Merge branch 'feature/distributed-demo' into feature/distributed-demo
8ohamed Dec 24, 2025
b3211dd
small fixes + removing init files + doc update
8ohamed Dec 24, 2025
ff2a283
revert python cli yml
8ohamed Dec 24, 2025
332d4de
fixing failing jobs
8ohamed Dec 25, 2025
81ecf4c
failing jobs
8ohamed Dec 25, 2025
507ed14
reverting changes
8ohamed Dec 25, 2025
2c99cec
end-to-end services commands tests
8ohamed Dec 25, 2025
a1f9ca8
small fix + doc
8ohamed Dec 25, 2025
1e952d8
update runner
8ohamed Dec 25, 2025
1c5d1fc
pylint issues
8ohamed Dec 25, 2025
5f3b41f
fix to yml files
8ohamed Dec 25, 2025
d82732e
applies copilot suggestion on the failing job
8ohamed Dec 25, 2025
83588a3
runs system test with sudo when needed + small fixes
8ohamed Dec 25, 2025
b376a2c
skip certificate copying in CI test environment
8ohamed Dec 25, 2025
ff75986
creating dummy keys instead of skipping
8ohamed Dec 25, 2025
2e72b8a
setting docker in workflow
8ohamed Dec 25, 2025
057b8b3
small fix
8ohamed Dec 25, 2025
d943a85
small fix to cert test
8ohamed Dec 25, 2025
9e96379
minor update
8ohamed Dec 25, 2025
bedcc9f
fixing the command testing for linux
8ohamed Dec 25, 2025
a113781
lint issues
8ohamed Dec 26, 2025
a834230
servers clean-up
8ohamed Dec 26, 2025
49a0fea
fixes some pylint issues
8ohamed Dec 26, 2025
5edcfaa
lint issues
8ohamed Dec 26, 2025
4f61014
update yml files
8ohamed Dec 27, 2025
8fea376
reverting changes
8ohamed Dec 27, 2025
13513dc
updates dependencies
8ohamed Dec 27, 2025
11cdfd6
small updates to tests
8ohamed Dec 28, 2025
4f3c64d
minor fixes
8ohamed Dec 28, 2025
527568b
small fix
8ohamed Dec 28, 2025
af41f20
Removed sudo requirement
8ohamed Dec 28, 2025
40e5ba8
Rich error output
8ohamed Dec 28, 2025
0cd5a12
updates tests (ported some changes from 1377)
8ohamed Dec 28, 2025
a646ea0
fixes quality issues
8ohamed Dec 28, 2025
946295d
minor updates
8ohamed Dec 28, 2025
aea8200
minor fix to test
8ohamed Dec 28, 2025
0026324
fixes pylint warning
8ohamed Jan 3, 2026
d96dd1f
fixing pylint issues at the top cli tests
8ohamed Jan 3, 2026
84224fe
revert changes in top level cli
8ohamed Jan 4, 2026
ea31b71
fixes the get_status command
8ohamed Jan 5, 2026
fb8069e
ensuring Compose project name
8ohamed Jan 6, 2026
01b2a20
qlty issues
8ohamed Jan 6, 2026
733d99d
qlty fixes in service.py
8ohamed Jan 6, 2026
c7aa571
qlty issues
8ohamed Jan 6, 2026
9c66e41
qlty issues
8ohamed Jan 8, 2026
fa07324
minor fix
8ohamed Jan 8, 2026
c091bb8
minor fix
8ohamed Jan 8, 2026
808ac46
minor fix
8ohamed Jan 8, 2026
821efbc
small refactor
8ohamed Jan 8, 2026
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
15 changes: 6 additions & 9 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,41 +6,38 @@ updates:
interval: "weekly"
day: "sunday"
assignees:
- "octocat"
- "octocat"
- "prasadtalasila"
commit-message:
prefix: "client-npm: "
target-branch: "dependabot-merge"
pull-request-branch-name:
separator: "-"
reviewers:
- "prasadtalasila"

- package-ecosystem: "npm"
directory: "/servers/lib"
schedule:
interval: "weekly"
day: "sunday"
assignees:
- "octocat"
- "octocat"
- "prasadtalasila"
commit-message:
prefix: "libms-npm: "
target-branch: "dependabot-merge"
pull-request-branch-name:
separator: "-"
reviewers:
- "prasadtalasila"

- package-ecosystem: "npm"
directory: "/servers/execution/runner"
schedule:
interval: "weekly"
day: "sunday"
assignees:
- "octocat"
- "octocat"
- "prasadtalasila"
commit-message:
prefix: "runner-npm: "
target-branch: "dependabot-merge"
pull-request-branch-name:
separator: "-"
reviewers:
- "prasadtalasila"
30 changes: 15 additions & 15 deletions .github/workflows/client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ jobs:
client:
name: Test react website
permissions:
contents: read # Required for checking out the code
actions: write # Required for uploading artifacts
contents: read # Required for checking out the code
actions: write # Required for uploading artifacts
strategy:
matrix:
os: [windows-latest, ubuntu-latest]
Expand Down Expand Up @@ -66,8 +66,8 @@ jobs:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
files: client/coverage/all/coverage-final.json
flags: client-unit-integration-tests
flags: client-unit-integration-tests

- name: Run e2e tests
continue-on-error: true
run: |
Expand All @@ -76,7 +76,7 @@ jobs:
- name: Upload Playwright Report (Linux)
# v6.0.0
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f
if: ${{ !cancelled() && runner.os == 'Linux'}}
if: ${{ !cancelled() && runner.os == 'Linux' }}
with:
name: playwright-report-linux
path: client/playwright-report/**
Expand All @@ -101,7 +101,7 @@ jobs:
get-version:
name: Get version
permissions:
contents: read # Required for checking out the code
contents: read # Required for checking out the code
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
Expand All @@ -119,39 +119,39 @@ jobs:

publish-docker-image-ghcr:
permissions:
contents: read # Required for checking out the code
packages: write # Push to github package registry
contents: read # Required for checking out the code
packages: write # Push to github package registry
if: |
github.event_name == 'push' &&
(
startsWith(github.ref, 'refs/heads/feature/') ||
startsWith(github.ref, 'refs/heads/release-v')
)

name: Publish Docker image (GHCR)
needs: [client, get-version]
uses: ./.github/workflows/docker-ghcr.yml
with:
with:
image-name: dtaas-web
version: ${{ needs.get-version.outputs.version }}
dockerfile: client.built.dockerfile
secrets: inherit

publish-docker-image-dockerhub:
permissions:
contents: read # Required for checking out the code
packages: write # Required for publishing to github package registry
if: |
contents: read # Required for checking out the code
packages: write # Required for publishing to github package registry
if: |
github.event_name == 'push' &&
(
startsWith(github.ref, 'refs/heads/feature/') ||
startsWith(github.ref, 'refs/heads/release-v')
)

name: Publish Docker image (DockerHub)
needs: [client, get-version]
uses: ./.github/workflows/docker-dockerhub.yml
with:
with:
image-name: dtaas-web
version: ${{ needs.get-version.outputs.version }}
dockerfile: client.built.dockerfile
Expand Down
13 changes: 6 additions & 7 deletions .github/workflows/docker-dockerhub.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Reusable workflow for building and pushing a Docker Image to DockerHub.
#
#
# Auth username is taken from the repository secret, "DOCKERHUB_USERNAME"
# Publish username is taken from the repository secret, "DOCKERHUB_SCOPE"
# Password is taken from the repository secret, "DOCKERHUB_TOKEN"
#
#
# NOTE: DockerHub currently does not provide PATs for organizations.
# Users belonging to the org must use their own, which is why we need a
# username to publish through: DOCKERHUB_USERNAME, and a username to publish
Expand All @@ -13,8 +13,8 @@
name: Build and Push Docker Image (DockerHub)

permissions:
contents: read # Required for checking out the code
packages: write # Push to github package registry
contents: read # Required for checking out the code
packages: write # Push to github package registry

on:
workflow_call:
Expand Down Expand Up @@ -55,9 +55,8 @@ jobs:
runs-on: ubuntu-latest

permissions:
contents: read # ✅ Required for checking out the code
packages: write # ✅ Required for publishing to github package registry

contents: read # Required for checking out the code
packages: write # Required for publishing to github package registry
steps:
- name: Checkout Repository
# v6.0.1
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/docker-ghcr.yml
Comment thread
prasadtalasila marked this conversation as resolved.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Reusable workflow for building and pushing a Docker Image to GHCR.
#
#
# Username is the repository owner converted to lowercase
# Password is taken from the auto-generated GitHub token

Expand All @@ -24,16 +24,16 @@ env:
password: ${{ secrets.GITHUB_TOKEN }}

permissions:
contents: read # Required for checking out the code
packages: write # Push to github package registry
contents: read # Required for checking out the code
packages: write # Push to github package registry

jobs:
build-and-push-image:
runs-on: ubuntu-latest

permissions:
packages: write # Push to github package registry
contents: read # Required for checking out the code
packages: write # Push to github package registry
contents: read # Required for checking out the code

steps:
- name: Checkout Repository
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ on:
workflow_dispatch:

permissions:
contents: read # Required for checking out the code
contents: read # Required for checking out the code

jobs:
docs:
name: Build html docs only
runs-on: ubuntu-latest
permissions:
contents: read # Required for checking out the code
contents: read # Required for checking out the code
steps:
- name: Checkout
# v6.0.1
Expand Down
50 changes: 25 additions & 25 deletions .github/workflows/lib-ms.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ env:
jobs:
test-lib-ms:
permissions:
contents: read # Required for checking out the code
contents: read # Required for checking out the code
name: Test library microservice
strategy:
matrix:
Expand Down Expand Up @@ -76,15 +76,15 @@ jobs:
LIBMS_LOCAL_PATH: ${{ github.workspace }}/files
LIBMS_PORT: ${{ env.HTTP_PORT }}
run: |
node test/update-config.js
node test/update-config.js

- name: Start http mode
env:
LIBMS_CONFIG_PATH: ${{env.LIBMS_CONFIG_PATH}}
env:
LIBMS_CONFIG_PATH: ${{ env.LIBMS_CONFIG_PATH }}
run: |
yarn build
yarn start:pm2

- name: Check server is running (Windows)
if: runner.os == 'Windows'
env:
Expand Down Expand Up @@ -127,29 +127,29 @@ jobs:

get-version:
permissions:
contents: read # Required for checking out the code
contents: read # Required for checking out the code
name: Get version and variables
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
# v6.0.1
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
- name: Install jq
run: sudo apt-get install -y jq
- name: get version
id: get-version
run: |
version=$(jq -r '.version' ./servers/lib/package.json)
echo "version=$version" >> $GITHUB_OUTPUT
echo "node-version=$NODE_VERSION" >> $GITHUB_OUTPUT
- name: Checkout Repository
# v6.0.1
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
- name: Install jq
run: sudo apt-get install -y jq
- name: get version
id: get-version
run: |
version=$(jq -r '.version' ./servers/lib/package.json)
echo "version=$version" >> $GITHUB_OUTPUT
echo "node-version=$NODE_VERSION" >> $GITHUB_OUTPUT
outputs:
version: ${{ steps.get-version.outputs.version }}
node-version: ${{ steps.get-version.outputs.node-version }}

publish-package-github:
permissions:
contents: read # Required for checking out the code
packages: write # Required for github package registry
contents: read # Required for checking out the code
packages: write # Required for github package registry
if: |
github.event_name == 'push' &&
(
Expand All @@ -170,8 +170,8 @@ jobs:

publish-package-npm:
permissions:
packages: write # Push to github package registry
contents: read # Required for checking out the code
packages: write # Push to github package registry
contents: read # Required for checking out the code
if: |
github.event_name == 'push' &&
(
Expand All @@ -192,8 +192,8 @@ jobs:

publish-docker-image-ghcr:
permissions:
contents: read # Required for checking out the code
packages: write # Required for publishing to github package registry
contents: read # Required for checking out the code
packages: write # Required for publishing to github package registry
if: |
github.event_name == 'push' &&
(
Expand All @@ -212,8 +212,8 @@ jobs:

publish-docker-image-dockerhub:
permissions:
contents: read # Required for checking out the code
packages: write # Required for publishing to github package registry
contents: read # Required for checking out the code
packages: write # Required for publishing to github package registry
if: |
github.event_name == 'push' &&
(
Expand Down
Loading
Loading