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

EB -> feature/eb_feature_branch_docker. Only for Docker (DO NOT MERGE!) #388

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 environments/template/group_vars/template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ attribute_aggregation_gui_version: "2.1.1"
attribute_aggregation_server_version: "2.1.1"
oidc_playground_client_version: "2.4.3"
oidc_playground_server_version: "2.4.3"
engine_version: "6.6.5"
engine_version: "feature/include-sp-org-name-in-consent-api-response"
manage_gui_version: "6.0.10"
manage_server_version: "6.0.10"
lifecycle_version: "0.0.5"
Expand Down
2 changes: 1 addition & 1 deletion environments/vm/group_vars/vm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ attribute_aggregation_gui_version: "2.1.1"
attribute_aggregation_server_version: "2.1.1"
oidc_playground_client_version: "2.4.3"
oidc_playground_server_version: "2.4.3"
engine_version: "6.6.5"
engine_branch: "feature/include-sp-org-name-in-consent-api-response"
manage_gui_version: "6.0.10"
manage_server_version: "6.0.10"
lifecycle_version: "0.0.5"
Expand Down
28 changes: 3 additions & 25 deletions roles/engineblock/tasks/build.yml
Original file line number Diff line number Diff line change
@@ -1,30 +1,8 @@
- name: Get Composer installer signature.
uri:
url: https://composer.github.io/installer.sig
return_content: true
register: composer_installer_signature

- name: Download Composer installer
- name: Download Composer
get_url:
url: https://getcomposer.org/installer
dest: /tmp/composer-installer.php
url: https://getcomposer.org/download/latest-1.x/composer.phar
dest: "{{ composer_path }}"
mode: 0755
checksum: "sha384:{{ composer_installer_signature.content }}"
register: reg_composer_installer

- name: Run Composer installer
command: >
php72 composer-installer.php
chdir=/tmp
when:
- reg_composer_installer.changed | bool

- name: Move Composer into globally-accessible location.
command: >
mv -f /tmp/composer.phar {{ composer_path }}
creates={{ composer_path }}
when:
- reg_composer_installer.changed | bool

- name: Remove Nodesource repositories for Node.js
yum:
Expand Down
13 changes: 13 additions & 0 deletions roles/engineblock/tasks/install-branch.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,17 @@
---
- name: Install git and which
yum:
name:
- which
- git
state: present

- name: Symlink /usr/bin/php to /usr/bin/php72
file:
src: /usr/bin/php72
dest: /usr/bin/php
state: link

- name: Check if target dir exists
stat:
path: "{{ engine_release_dir }}"
Expand Down
4 changes: 4 additions & 0 deletions tests/githubactions-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ cat <<-'EOF' > ansible.cfg
ssh_args=-o ControlMaster=auto -o ControlPersist=60m
pipelining=True
EOF
# Download and extract Mitogen
git clone https://github.com/dw/mitogen.git
export ANSIBLE_STRATEGY_PLUGINS=mitogen/ansible_mitogen/plugins
export ANSIBLE_STRATEGY=mitogen_linear

# Prepare the environment
echo "Prepping the environment"
Expand Down