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

Modify requirements content #256

Merged
merged 2 commits into from
Feb 21, 2024
Merged

Modify requirements content #256

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
b3732dc
Modify requirements content
rjrpaz Feb 21, 2024
f6ab530
Change repo type for ansible-galaxy. Restrict rubygems version for th…
rjrpaz Feb 21, 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
6 changes: 4 additions & 2 deletions .github/workflows/kpm_ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ jobs:
- name: Upgrade rubygems
run: |
# See https://github.com/rubygems/rubygems/pull/3146
gem update --system
# gem update --system
gem update --system --conservative || (gem i "rubygems-update:~>2.7" --no-document && update_rubygems)
gem update bundler --conservative
- name: Start stack
run: |
cd kpm/docker && docker-compose -p it -f docker-compose.ci.mysql.yml up -d
Expand Down Expand Up @@ -87,4 +89,4 @@ jobs:
echo "[DEBUG] killbill raw logs"
sudo cat /tmp/it/logs/killbill.out || true
echo "[DEBUG] db logs"
docker logs --details it_db_1 || true
docker logs --details it_db_1 || true
5 changes: 4 additions & 1 deletion ansible/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@ library = ~/.ansible/roles/killbill-cloud/ansible/library
2. Create a file `requirements.yml`:

```
- src: https://github.com/killbill/killbill-cloud
- name: killbill-cloud
src: git@github.com:killbill/killbill-cloud.git
version: origin/master
scm: git
```

then run `ansible-galaxy install -r requirements.yml`.
Expand Down
2 changes: 1 addition & 1 deletion docker/templates/base/latest/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ WORKDIR $TOMCAT_HOME
# Install ansible roles dependencies
ARG KILLBILL_CLOUD_VERSION
RUN ansible-galaxy collection install community.general && \
ansible-galaxy install git+https://github.com/killbill/killbill-cloud.git,$KILLBILL_CLOUD_VERSION
ansible-galaxy install git+ssh://git@github.com/killbill/killbill-cloud.git,$KILLBILL_CLOUD_VERSION
ENV KILLBILL_CLOUD_ANSIBLE_ROLES=$TOMCAT_HOME/.ansible/roles/killbill-cloud/ansible
ENV ENV_HOST_IP=localhost
ENV ANSIBLE_OPTS="-i localhost, \
Expand Down
Loading