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

Jump to bottom

feature: support prosody 0.11 installs #68

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+19 −3
Open

feature: support prosody 0.11 installs #68

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
6a9c907
feature: support prosody 0.11 installs
aaronkvanmeerten Feb 17, 2023
2a14e1b
PROSODY_VERSION control
aaronkvanmeerten Feb 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions jenkins/jobs/build-image-oracle.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@
name: PROSODY_VERSION
description: "Prosody Version"
trim: true
- string:
name: PROSODY_APT_FLAG
description: "Prosody apt flag, set to 'false' for URL"
trim: true
- string:
name: JVB_VERSION
description: "Videobridge Version"
Expand Down
12 changes: 12 additions & 0 deletions jenkins/jobs/provision-standalone.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,18 @@
name: MEMORY_IN_GBS
description: "Overrides OCI Memory size"
trim: true
- string:
name: PROSODY_FROM_URL
description: "Flag to control prosody from apt or URL, defaults to apt, set to 'true' for URL"
trim: true
- string:
name: PROSODY_URL_VERSION
description: "Version to use from URL, defaults to '0.11.14'"
trim: true
- string:
name: PROSODY_VERSION
description: "Version to use from apt, defaults to latest in apt"
trim: true
- string:
name: INFRA_CONFIGURATION_REPO
default: git@github.com:jitsi/infra-configuration.git
Expand Down
6 changes: 3 additions & 3 deletions scripts/build-signal-oracle.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,9 @@ packer build \
-var "jicofo_version=$JICOFO_VERSION" \
-var "jitsi_meet_version=$JITSI_MEET_VERSION" \
-var "prosody_version=$PROSODY_VERSION" \
$([ ! -z $PROSODY_APT_FLAG ] && echo "-var prosody_apt_flag=$PROSODY_APT_FLAG") \
$([ ! -z $PROSODY_PACKAGE_VERSION ] && echo "-var prosody_package_version=$PROSODY_PACKAGE_VERSION") \
$([ ! -z $PROSODY_URL_VERSION ] && echo "-var prosody_url_version=$PROSODY_URL_VERSION") \
$([ -n "$PROSODY_APT_FLAG" ] && echo "-var prosody_apt_flag=$PROSODY_APT_FLAG") \
$([ -n "$PROSODY_PACKAGE_VERSION" ] && echo "-var prosody_package_version=$PROSODY_PACKAGE_VERSION") \
$([ -n "$PROSODY_URL_VERSION" ] && echo "-var prosody_url_version=$PROSODY_URL_VERSION") \
-var "ansible_python_interpreter=/usr/bin/python3" \
-var "ansible_deploy_tags=$DEPLOY_TAGS" \
-var "ansible_skip_tags=failfast" \
Expand Down