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.

Sign up for GitHub

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

[MISC] Tests removing workaround and using pebble 1.6.0 [DO NOT MERGE] #59

Closed
wants to merge 2 commits into from
Closed

[MISC] Tests removing workaround and using pebble 1.6.0 [DO NOT MERGE] #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b99f6a
[MISC] Tests removing workaround and using pebble 1.6.0
deusebio Dec 1, 2023
76166fb
fix path on docker
deusebio Dec 1, 2023
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
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_IMAGE=base-charmed-spark:latest
FROM $BASE_IMAGE
# Provide Default Entrypoint for Pebble
ENTRYPOINT [ "/bin/pebble", "enter", "--verbose", "--args", "sparkd" ]
ENTRYPOINT [ "/opt/pebble/bin/pebble", "enter", "--verbose", "--args", "sparkd" ]
10 changes: 0 additions & 10 deletions files/spark/bin/sparkd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
#!/bin/bash

function finish {
if [ $? -ne 0 ]
then
kill -1 1
sleep 1
fi
}
trap finish EXIT


FLAVOUR=$1

echo "Running script with ${FLAVOUR} flavour"
Expand Down
11 changes: 9 additions & 2 deletions rockcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description: Spark ROCK
license: Apache-2.0

version: "3.4.1"
base: ubuntu:22.04
base: ubuntu@22.04
platforms:
amd64:

Expand All @@ -15,7 +15,7 @@ environment:
SPARK_CONFS: /etc/spark8t/conf
JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
PYTHONPATH: /opt/spark/python:/opt/spark8t/python/dist:/usr/lib/python3.10/site-packages
PATH: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/spark:/opt/spark/bin:/opt/spark/python/bin:/opt/spark-client/python/bin
PATH: /opt/pebble/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/spark:/opt/spark/bin:/opt/spark/python/bin:/opt/spark-client/python/bin
HOME: /var/lib/spark
KUBECONFIG: /var/lib/spark/.kube/config
SPARK_USER_DATA: /var/lib/spark
Expand Down Expand Up @@ -182,6 +182,13 @@ parts:
- opt/spark-client/python/bin/spark-client.spark-shell
- opt/spark-client/python/bin/spark-client.spark-submit

new-pebble:
plugin: nil
stage-snaps:
- pebble/latest/candidate
organize:
bin: opt/pebble/bin/

user-setup:
plugin: nil
after: [ charmed-spark ]
Expand Down