Skip to content

Commit

Permalink
JBIDE-16140 rename inis to configs and a few typos/nits
Browse files Browse the repository at this point in the history
  • Loading branch information
maxandersen authored and nickboldt committed Aug 14, 2015
1 parent 09f1344 commit 36f4a6b
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion buildchow/configs/dockerhost/jenkins_jobs.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ url=https://dockerhost:8080
query_plugins_info=false

[job_builder]
include_path=.:../defaults
include_path=.:../default
12 changes: 6 additions & 6 deletions buildchow/readme.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ INFO: Please note that for supporting jenkins host specific overrides you *must*
to where the .ini file is and mention the .ini file to run it correctly.

```
$ cd inis/defaults
$ cd configs/default
$ jenkins-jobs --conf jenkins-jobs.ini test ../../templates/ -o generated
```

Expand All @@ -44,7 +44,7 @@ To upload directly to jenkins you need to manually update `jobs_jenkins.ini` wit
and run the following:

```
$ cd inis/defaults
$ cd configs/default
$ jenkins-jobs --conf jenkins-jobs.ini update ../../templates/ config/
```

Expand All @@ -56,14 +56,14 @@ $ jenkins-jobs --conf jenkins-jobs.ini update ../../templates/ config/
| link:templates[]
| The templates for jobs written in `.yaml`. If you want to add or change a job then you tend to edit this.

| link:inis[]
| link:configs[]
| Directory with a directory per specific jenkins host.

| link:inis/defaults[]
| link:configs/default[]
| Has the default jenkins setup (currently using internal jboss jenkins). Has `.inc` files to define defaults
for machine specific settings. Intent is that other inis can use this as a fallback.
for machine specific settings. Intent is that other configs can use this as a fallback.

| link:inis/dockerhost[]
| link:configs/dockerhost[]
| Example for custom ini file using dockerhost + override of machine specific includes.

| link:etc/todirformat.sh[]
Expand Down
4 changes: 2 additions & 2 deletions buildchow/templates/component-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
name: skipRevisionCheckWhenPublishing
default: "false"
description: |
Check box to always publish new build to staging / nightly. <br/>
Check box to always publish new build to snapshots. <br/>
Unchecked, publish.sh will check previous build's revision to decide if this build needs <br/>
to overwrite the previous one, or if it's in fact the same source &amp; therefore same binaries.<br/>
Expand Down Expand Up @@ -112,7 +112,7 @@
publishers:
- archive:
artifacts: >
results/*/all/*Update*.zip,sources/*/target/jacoco.exec,
results/*/all/*.zip,sources/*/target/jacoco.exec,
sources/*/*tests/*/target/work/configuration/*.log,
sources/*/*tests/*/target/work/data/.metadata/*.log,
sources/target/coverage-report/**
Expand Down
2 changes: 1 addition & 1 deletion buildchow/todo.adoc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
= Advantages noticed within a week:

* fixing JRE across all jobs
* relasing target platform without breaking builds
* releasing target platform without breaking builds
* using 9.0 instead of 4.3.mars for stream
= Local Jenkins Configuration
Expand Down

0 comments on commit 36f4a6b

Please sign in to comment.