Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NVSK changes with CSP #168

Open
wants to merge 55 commits into
base: release-6.0.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
543065a
NVSK changes with CSP
adithyadinesh0412 Jan 1, 2024
09296ee
containerise the service
raghupathiguduri Feb 14, 2024
4dd5067
Merge pull request #22 from raghupathiguduri/release-6.0.0
prashanthShiksha Feb 21, 2024
eaafe0e
modified dockerfile
raghupathiguduri Feb 22, 2024
7bcb1e2
updated start-script permissions
raghupathiguduri Feb 22, 2024
8d1f48b
permission issue
raghupathiguduri Feb 22, 2024
c5bf9ad
updated dockerfile
raghupathiguduri Feb 22, 2024
1769dba
updated start-service
raghupathiguduri Feb 22, 2024
7353738
updated dockerfile
raghupathiguduri Feb 22, 2024
3ee4ab7
updated execute permissions
raghupathiguduri Feb 22, 2024
0bb0935
removing run.sh
raghupathiguduri Feb 22, 2024
275d408
Merge branch 'shikshalokam:release-6.0.0' into release-6.0.0
raghupathiguduri Feb 22, 2024
0de5f12
added log folders
raghupathiguduri Feb 22, 2024
bf184ae
added logs folder
raghupathiguduri Feb 22, 2024
3c475be
update dockerfile
raghupathiguduri Feb 22, 2024
37661f4
Merge pull request #23 from raghupathiguduri/release-6.0.0
prashanthShiksha Feb 22, 2024
61e20fd
updated logs folder
raghupathiguduri Feb 22, 2024
6ccad6f
Merge branch 'shikshalokam:release-6.0.0' into release-6.0.0
raghupathiguduri Feb 22, 2024
b3fc5fb
Merge pull request #24 from raghupathiguduri/release-6.0.0
prashanthShiksha Feb 22, 2024
9dcec80
Update Dockerfile
raghupathiguduri Feb 22, 2024
77bc056
Merge pull request #25 from raghupathiguduri/patch-1
prashanthShiksha Feb 22, 2024
173edd0
Update Dockerfile
raghupathiguduri Feb 22, 2024
95a19ee
Added survey_realtime_streaming.py script
prashanthShiksha Feb 22, 2024
09c8e0f
Merge pull request #26 from prashanthShiksha/release-6.0.0
prashanthShiksha Feb 22, 2024
e53d3af
writable dir
raghupathiguduri Feb 22, 2024
a3135fe
permission for writable
raghupathiguduri Feb 22, 2024
58222ef
updates steps of dockerfile
raghupathiguduri Feb 22, 2024
f31cc67
Merge branch 'shikshalokam:release-6.0.0' into release-6.0.0
raghupathiguduri Feb 22, 2024
5348cf0
Merge pull request #27 from raghupathiguduri/release-6.0.0
prashanthShiksha Feb 22, 2024
3140f43
updated check survey_submission_id exits function
prashanthShiksha Feb 26, 2024
272019c
Added solution_externalId and solution_id key
prashanthShiksha Mar 8, 2024
e9abbbc
Merge pull request #29 from prashanthShiksha/release-6.0.0
prashanthShiksha Mar 8, 2024
cefd8b3
Update start-services.sh for kb
Vivek-M-08 Mar 8, 2024
4645041
revert back start-services.sh changes
Vivek-M-08 Mar 8, 2024
93d5573
added start-faust-services.sh file for KB
Mar 8, 2024
a4352c6
Merge pull request #30 from Vivek-M-08/release-6.0.0
Vivek-M-08 Mar 8, 2024
444ad90
removed start-faust-services.sh
Mar 8, 2024
9fdb85a
Merge pull request #31 from Vivek-M-08/release-6.0.0
Vivek-M-08 Mar 8, 2024
a01f2d4
handling missing data-source exceptions
Mar 12, 2024
f3205d2
Merge pull request #32 from Vivek-M-08/release-6.0.0
Vivek-M-08 Mar 12, 2024
cdc26d3
removed userRoleInfo logic
Mar 12, 2024
5ae9e8b
Merge pull request #33 from Vivek-M-08/release-6.0.0
Vivek-M-08 Mar 12, 2024
05cb949
changed key name
prashanthShiksha Mar 13, 2024
c3126d3
Merge pull request #34 from prashanthShiksha/release-6.0.0
prashanthShiksha Mar 13, 2024
c438c83
Added stringefied json config
prashanthShiksha Mar 17, 2024
2bf7f6b
Merge pull request #35 from prashanthShiksha/release-6.0.0
aks30 Mar 18, 2024
d4fa885
added observation-realtime-streaming.py script
prashanthShiksha Mar 22, 2024
f51140e
Made changes in the observation-realtime-streaming.py script
prashanthShiksha Mar 25, 2024
cd712e2
Made changes in the script
prashanthShiksha Mar 25, 2024
5846922
Made changes in the script
prashanthShiksha Mar 25, 2024
6be0c28
made changes in start-service.sh file
prashanthShiksha Mar 25, 2024
8b0088c
made changes in the script
prashanthShiksha Mar 25, 2024
20a5600
Merge pull request #36 from prashanthShiksha/release-6.0.0
prashanthShiksha Mar 25, 2024
4025e3a
made changes in the script
prashanthShiksha Mar 26, 2024
2caef63
Merge pull request #37 from prashanthShiksha/release-6.0.0
Vivek-M-08 Mar 26, 2024
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
32 changes: 32 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#Official Ubuntu Image
FROM ubuntu:20.04
#Install necessary packages
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive \
apt-get install -y \
openjdk-8-jdk \
software-properties-common \
python3-pip \
python3-venv \
python3-virtualenv \
zip \
unzip \
acl
#Create the User
RUN useradd -m -s /bin/bash analytics
RUN mkdir -p /opt/sparkjobs/ml-analytics-service/logs/observation/evidence
RUN mkdir -p /opt/sparkjobs/ml-analytics-service/logs/observation/status
RUN mkdir -p /opt/sparkjobs/ml-analytics-service/logs/project
RUN mkdir -p /opt/sparkjobs/ml-analytics-service/logs/project/evidence
RUN mkdir -p /opt/sparkjobs/ml-analytics-service/logs/survey
RUN mkdir -p /opt/sparkjobs/ml-analytics-service/logs/survey/evidence && chown -R analytics:analytics /opt/sparkjobs/ml-analytics-service
RUN chmod +rwx -R /opt/sparkjobs/ml-analytics-service/
COPY . /opt/sparkjobs/ml-analytics-service/
COPY faust.sh /opt/sparkjobs/faust_as_service/faust.sh
RUN chown -R analytics:analytics /opt/sparkjobs/ml-analytics-service
USER analytics
WORKDIR /opt/sparkjobs/ml-analytics-service
RUN virtualenv spark_venv
RUN /opt/sparkjobs/ml-analytics-service/spark_venv/bin/pip install --upgrade -r /opt/sparkjobs/ml-analytics-service/requirements.txt
COPY start-services.sh .
CMD ./start-services.sh
42 changes: 42 additions & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
node('build-slave') {
try {
String ANSI_GREEN = "\u001B[32m"
String ANSI_NORMAL = "\u001B[0m"
String ANSI_BOLD = "\u001B[1m"
String ANSI_RED = "\u001B[31m"
String ANSI_YELLOW = "\u001B[33m"
ansiColor('xterm') {
timestamps {
stage('Checkout') {
if (!env.hub_org) {
println(ANSI_BOLD + ANSI_RED + "Uh Oh! Please set a Jenkins environment variable named hub_org with value as registery/sunbidrded" + ANSI_NORMAL)
error 'Please resolve the errors and rerun..'
} else
println(ANSI_BOLD + ANSI_GREEN + "Found environment variable named hub_org with value as: " + hub_org + ANSI_NORMAL)
}
// cleanWs()
checkout scm
commit_hash = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
build_tag = sh(script: "echo " + params.github_release_tag.split('/')[-1] + "_" + commit_hash + "_" + env.BUILD_NUMBER, returnStdout: true).trim()
echo "build_tag: " + build_tag
}
stage('Build') {
env.NODE_ENV = "build"
print "Environment will be : ${env.NODE_ENV}"
sh('git submodule update --init')
sh('git submodule update --init --recursive --remote')
sh('chmod 777 build.sh')
sh("./build.sh ${build_tag} ${env.NODE_NAME} ${hub_org}")
}

stage('ArchiveArtifacts') {
archiveArtifacts "metadata.json"
currentBuild.description = "${build_tag}"
}
}
}
catch (err) {
currentBuild.result = "FAILURE"
throw err
}
}
9 changes: 9 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/bash
# Build script
set -eo pipefail
build_tag=$1
name=ml-analytics-service
node=$2
org=$3
docker build -f ./Dockerfile --label commitHash=$(git rev-parse --short HEAD) -t ${org}/${name}:${build_tag} .
echo {\"image_name\" : \"${name}\", \"image_tag\" : \"${build_tag}\", \"node_name\" : \"$node\"} > metadata.json
4 changes: 4 additions & 0 deletions faust.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh
export LANG=C.UTF-8
export LC_ALL=C.UTF-8
/opt/sparkjobs/ml-analytics-service/spark_venv/bin/python /opt/sparkjobs/ml-analytics-service/$1.py --workdir /opt/sparkjobs/ml-analytics-service/$2 worker -l info
Loading