Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
configuration
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
configuration
Commits
d528590e
Commit
d528590e
authored
7 years ago
by
Ben Patterson
Committed by
GitHub
7 years ago
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3764 from edx/benp/add-new-relic-jenkins-worker
Add newrelic to jenkins workers.
parents
25346622
8b85517b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletions
+3
-1
playbooks/roles/jenkins_worker/meta/main.yml
+1
-0
util/packer/jenkins_worker.json
+2
-1
No files found.
playbooks/roles/jenkins_worker/meta/main.yml
View file @
d528590e
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
dependencies
:
dependencies
:
-
common
-
common
-
jscover
-
jscover
-
newrelic
-
role
:
oraclejdk
-
role
:
oraclejdk
oraclejdk_version
:
"
8u60"
oraclejdk_version
:
"
8u60"
oraclejdk_base
:
"
jdk1.8.0_60"
oraclejdk_base
:
"
jdk1.8.0_60"
...
...
This diff is collapsed.
Click to expand it.
util/packer/jenkins_worker.json
View file @
d528590e
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
"variables"
:
{
"variables"
:
{
"aws_access_key"
:
"{{env `AWS_ACCESS_KEY_ID`}}"
,
"aws_access_key"
:
"{{env `AWS_ACCESS_KEY_ID`}}"
,
"aws_secret_key"
:
"{{env `AWS_SECRET_ACCESS_KEY`}}"
,
"aws_secret_key"
:
"{{env `AWS_SECRET_ACCESS_KEY`}}"
,
"new_relic_key"
:
"{{env `NEW_RELIC_KEY`}}"
,
"playbook_remote_dir"
:
"/tmp/packer-edx-playbooks"
,
"playbook_remote_dir"
:
"/tmp/packer-edx-playbooks"
,
"venv_dir"
:
"/edx/app/edx_ansible/venvs/edx_ansible"
,
"venv_dir"
:
"/edx/app/edx_ansible/venvs/edx_ansible"
,
"ami"
:
"{{env `JENKINS_WORKER_AMI`}}"
,
"ami"
:
"{{env `JENKINS_WORKER_AMI`}}"
,
...
@@ -50,7 +51,7 @@
...
@@ -50,7 +51,7 @@
"command"
:
". {{user `venv_dir`}}/bin/activate && ansible-playbook"
,
"command"
:
". {{user `venv_dir`}}/bin/activate && ansible-playbook"
,
"inventory_groups"
:
"jenkins_worker"
,
"inventory_groups"
:
"jenkins_worker"
,
"extra_arguments"
:
[
"extra_arguments"
:
[
"-e
\"
jenkins_edx_platform_version={{user `test_platform_version`}}
\"
"
,
"-e
\"
jenkins_edx_platform_version={{user `test_platform_version`}}
NEWRELIC_LICENSE_KEY={{user `new_relic_key`}}
\"
"
,
"-vvv"
"-vvv"
]
]
},
{
},
{
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment