[GitHub] asfgit commented on issue #4: AMBARI-24724. Remove ambari-metrics dependency on ambari-commons.
asfgit commented on issue #4: AMBARI-24724. Remove ambari-metrics dependency on ambari-commons. URL: https://github.com/apache/ambari-metrics/pull/4#issuecomment-426512496 Refer to this link for build results (access rights to CI server needed): https://builds.apache.org/job/Ambari-Metrics-Github-PR-Builder/11/ Test PASSed. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] asfgit commented on issue #4: AMBARI-24724. Remove ambari-metrics dependency on ambari-commons.
asfgit commented on issue #4: AMBARI-24724. Remove ambari-metrics dependency on ambari-commons. URL: https://github.com/apache/ambari-metrics/pull/4#issuecomment-426511102 Refer to this link for build results (access rights to CI server needed): https://builds.apache.org/job/Ambari-Metrics-Github-PR-Builder/10/ Test PASSed. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] asfgit commented on issue #5: [AMBARI-24723] Support wild cards in AppId and InstanceId fields in AMS GET API.
asfgit commented on issue #5: [AMBARI-24723] Support wild cards in AppId and InstanceId fields in AMS GET API. URL: https://github.com/apache/ambari-metrics/pull/5#issuecomment-426509390 Refer to this link for build results (access rights to CI server needed): https://builds.apache.org/job/Ambari-Metrics-Github-PR-Builder/9/ Test PASSed. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] avijayanhwx opened a new pull request #5: [AMBARI-24723] Support wild cards in AppId and InstanceId fields in AMS GET API.
avijayanhwx opened a new pull request #5: [AMBARI-24723] Support wild cards in AppId and InstanceId fields in AMS GET API. URL: https://github.com/apache/ambari-metrics/pull/5 ## What changes were proposed in this pull request? Add support for wildcards in appId and instanceId ## How was this patch tested? Manually tested. Added unit test. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] asfgit commented on issue #4: AMBARI-24724. Remove ambari-metrics dependency on ambari-commons.
asfgit commented on issue #4: AMBARI-24724. Remove ambari-metrics dependency on ambari-commons. URL: https://github.com/apache/ambari-metrics/pull/4#issuecomment-426492265 Refer to this link for build results (access rights to CI server needed): https://builds.apache.org/job/Ambari-Metrics-Github-PR-Builder/8/ Test PASSed. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] asfgit commented on issue #4: AMBARI-24724. Remove ambari-metrics dependency on ambari-commons.
asfgit commented on issue #4: AMBARI-24724. Remove ambari-metrics dependency on ambari-commons. URL: https://github.com/apache/ambari-metrics/pull/4#issuecomment-426477435 Refer to this link for build results (access rights to CI server needed): https://builds.apache.org/job/Ambari-Metrics-Github-PR-Builder/7/ Test FAILed. Test FAILured. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] swagle opened a new pull request #4: AMBARI-24724. Remove ambari-metrics dependency on ambari-commons.
swagle opened a new pull request #4: AMBARI-24724. Remove ambari-metrics dependency on ambari-commons. URL: https://github.com/apache/ambari-metrics/pull/4 ## What changes were proposed in this pull request? The unnecessary dep was added to support OS defaults and test functions around windows supportability added a few years back. Since then the windows support has not been supported by any developers and is no longer of any use. We recently separated the metrics repo and this dep creates a circular build time dependency. ## How was this patch tested? Ran unit tests. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[ambari] branch trunk updated: [AMBARI-24720] UI: Configure Rolling Restart Advanced Options.
This is an automated email from the ASF dual-hosted git repository.
ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 2c18ebe [AMBARI-24720] UI: Configure Rolling Restart Advanced Options.
2c18ebe is described below
commit 2c18ebe5b45910cadb76ab4f6eae75d7067f7eda
Author: Ishan Bhatt
AuthorDate: Mon Oct 1 14:24:02 2018 -0700
[AMBARI-24720] UI: Configure Rolling Restart Advanced Options.
---
ambari-web/app/messages.js | 15 +++-
ambari-web/app/styles/application.less | 44 +-
.../app/templates/common/service_restart.hbs | 96 ++
.../app/views/common/service_restart_view.js | 53 +---
4 files changed, 178 insertions(+), 30 deletions(-)
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index bbcece5..67c45f3 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -3284,7 +3284,20 @@ Em.I18n.translations = {
'service.rolling.restart.choose.info': 'Critical services remain running
while the upgrade is performed. Minimized disruption, but is a slower
upgrade.',
'service.express.restart.choose.info': 'Services are stopped when this
upgrade is performed. Incurs downtime, but is a faster upgrade.',
'service.restart.show.advanced.info': 'Show advanced configurations options
(Restart by
batches/hosts, interval between restarts, etc.)',
-
+ 'service.restart.rolling.title.info': 'RESTART HOSTS BY',
+ 'service.restart.rolling.batchesOfHosts': 'Batches of Hosts',
+ 'service.restart.rolling.rackByRack': 'Rack by Rack',
+ 'service.restart.rolling.advanced.noOfHosts': 'NUMBER OF HOSTS IN A BATCH',
+ 'service.restart.rolling.advanced.batchIntervalHosts': 'INTERVAL BETWEEN
BATCHES (SEC)',
+ 'service.restart.rolling.advanced.percentRacks': '% OF RACKS STARTED AT A
TIME',
+ 'service.restart.rolling.advanced.batchIntervalRacks': 'INTERVAL BETWEEN
RACKS (SEC)',
+ 'service.restart.rolling.advanced.automatic.retry': 'Automatically retry on
failed hosts',
+ 'service.restart.rolling.advanced.noOfRetries': 'NUMBER OF RETRIES PER HOST',
+ 'service.restart.rolling.advanced.max.failures.tolerated': 'MAXIMUM FAILURES
TOLERATED(Restart process is suspended after
threshold is reached)',
+ 'service.restart.rolling.advanced.max.failures.batch': 'MAXIMUM FAILURES
TOLERATED/BATCH',
+ 'service.restart.rolling.advanced.max.failures.rack': 'MAXIMUM FAILURES
TOLERATED/RACK',
+ 'service.restart.rolling.advanced.suppress.alerts': 'Suppress alerts during
rolling restart',
+ 'service.restart.rolling.advanced.pause.after.first': 'Pause after first
batch',
'rolling.command.context': 'Rolling set {0} to state "{1}" - batch {2} of
{3}',
'rolling.nothingToDo.header': 'Nothing to do',
diff --git a/ambari-web/app/styles/application.less
b/ambari-web/app/styles/application.less
index 56986e5..546aea4 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -3018,6 +3018,11 @@ a.abort-icon:hover {
}
.service-rolling-restart {
+
+ .radio + .radio, .checkbox + .checkbox {
+margin-top: 0;
+ }
+
.restart-header-info {
margin-bottom: 30px; margin-left: 10px;
}
@@ -3026,7 +3031,7 @@ a.abort-icon:hover {
margin-bottom: 15px;
display: flex;
}
- .rolling-block, .express-block {
+ .option-rolling-block, .option-express-block {
label {
font-size: 16px;
left: -20px;
@@ -3037,9 +3042,6 @@ a.abort-icon:hover {
padding-bottom: 5px;
}
}
- .express-block {
-margin-top: 0px;
- }
.fa-caret-right {
color: #1491C1;
}
@@ -3048,5 +3050,39 @@ a.abort-icon:hover {
float: left;
clear: both;
margin-left: 40px;
+margin-bottom: 10px;
+a {
+ color: inherit;
+ text-decoration: none;
+ cursor: default;
+}
+ }
+ .rolling-restart-advanced {
+display: inline-block;
+margin-top: 10px;
+margin-left: 60px;
+.rolling-restart-by {
+ display: flex;
+ margin-bottom: 20px;
+ input[type="radio"] {
+padding-left: 15px;
+ }
+ .checkbox.radio {
+display: inline-block;
+ }
+ .radio.big-radio {
+padding-right: 20px;
+ }
+}
+.input-option {
+ padding-bottom: 10px;
+ margin: 0;
+}
+.num-retries {
+ padding-left: 10px;
+}
+.separator {
+ width: 40em;
+}
}
}
diff --git a/ambari-web/app/templates/common/service_restart.hbs
b/ambari-web/app/templates/common/service_restart.hbs
index e183169..226b9df 100644
--- a/ambari-web/app/templates/common/service_restart.hbs
+++ b/ambari-web/app/templates/common/service_restart.hbs
@@ -18,22 +18,90 @@
-{{t service.restart.choose.text}}
-
-
-
-{{view view.rollingRestartCheckBox
labelIdentifier="use-rolling-restart"}}
-
[ambari-logsearch] branch master updated: Add Log Feeder container support.
This is an automated email from the ASF dual-hosted git repository.
oleewere pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ambari-logsearch.git
The following commit(s) were added to refs/heads/master by this push:
new ec71546 Add Log Feeder container support.
ec71546 is described below
commit ec7154640b9309439173c6526f3e3a7033e71313
Author: Oliver Szabo
AuthorDate: Tue Oct 2 17:08:37 2018 +0200
Add Log Feeder container support.
---
Makefile | 11 -
ambari-logsearch-logfeeder/build.xml | 6 +++
ambari-logsearch-logfeeder/pom.xml | 15 ++
.../docker-logsearch-logfeeder/Dockerfile | 56 ++
.../docker-logsearch-logfeeder/bin/entrypoint.sh | 33 +
.../docker-logsearch-logfeeder/bin/init.sh | 13 +
.../docker-logsearch-logfeeder/conf/log4j2.yml | 49 +++
.../conf/logfeeder-env.sh | 13 +
.../conf/logfeeder.properties | 33 +
.../shipper-conf/global.config.json| 10
.../shipper-conf/output.config.json| 36 ++
11 files changed, 274 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index a23e441..e101e3f 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,15 @@ endif
package:
$(MAVEN_BINARY) clean package
+install:
+ $(MAVEN_BINARY) clean install -DskipTests
+
+be:
+ $(MAVEN_BINARY) clean package -Pbe
+
+fe:
+ $(MAVEN_BINARY) clean package -Pfe
+
test:
$(MAVEN_BINARY) clean test
@@ -35,4 +44,4 @@ docker-build:
$(MAVEN_BINARY) clean package docker:build -DskipTests
-Dlogsearch.docker.tag=$(LOGSEARCH_BUILD_DOCKER_TAG)
docker-push:
- $(MAVEN_BINARY) clean package docker:build docker:push -DskipTests
-Dlogsearch.docker.tag=$(LOGSEARCH_BUILD_DOCKER_TAG)
\ No newline at end of file
+ $(MAVEN_BINARY) clean package docker:build docker:push -DskipTests
-Dlogsearch.docker.tag=$(LOGSEARCH_BUILD_DOCKER_TAG)
diff --git a/ambari-logsearch-logfeeder/build.xml
b/ambari-logsearch-logfeeder/build.xml
index 1fbb928..15fedbc 100644
--- a/ambari-logsearch-logfeeder/build.xml
+++ b/ambari-logsearch-logfeeder/build.xml
@@ -51,5 +51,11 @@
+
+
+
+
+
+
diff --git a/ambari-logsearch-logfeeder/pom.xml
b/ambari-logsearch-logfeeder/pom.xml
index 2582bb8..8b89ff6 100644
--- a/ambari-logsearch-logfeeder/pom.xml
+++ b/ambari-logsearch-logfeeder/pom.xml
@@ -303,6 +303,21 @@
+io.fabric8
+docker-maven-plugin
+
+ true
+
+
+
apache/ambari-logsearch-logfeeder:${logsearch.docker.tag}
+
+
${project.build.directory}/docker-logsearch-logfeeder
+
+
+
+
+
+
org.springframework.boot
spring-boot-maven-plugin
${spring-boot.version}
diff --git a/jenkins/containers/docker-logsearch-logfeeder/Dockerfile
b/jenkins/containers/docker-logsearch-logfeeder/Dockerfile
new file mode 100644
index 000..ab959a8
--- /dev/null
+++ b/jenkins/containers/docker-logsearch-logfeeder/Dockerfile
@@ -0,0 +1,56 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+FROM openjdk:11-jre
+MAINTAINER d...@ambari.apache.org
+
+ADD bin/entrypoint.sh /entrypoint.sh
+ADD bin/init.sh /init.sh
+ADD logfeeder /usr/lib/ambari-logsearch-logfeeder
+
+ADD conf/log4j2.yml /usr/lib/ambari-logsearch-logfeeder/conf/log4j2.yml
+ADD conf/logfeeder.properties
/usr/lib/ambari-logsearch-logfeeder/conf/logfeeder.properties
+ADD conf/logfeeder-env.sh
/usr/lib/ambari-logsearch-logfeeder/conf/logfeeder-env.sh
+
+ADD shipper-conf /shipper-conf
+
+ENV JAVA_HOME="/usr/java/default"
+ENV LOGFEEDER_USER="logfeeder"
+ENV LOGFEEDER_GROUP="logfeeder"
+ENV LOGFEEDER_UID=""
+ENV LOGFEEDER_GID=""
+ENV LOGSEARCH_INIT_FILE /init.sh
+ENV LOGFEEDER_PATH="/usr/lib/ambari-logsearch-logfeeder"
+ENV LOGFEEDER_CONF_DIR="/usr/lib/ambari-logsearch-logfeeder/conf"
+ENV LOG_PATH="/var/log/ambari-logsearch-logfeeder"
+ENV LOGFILE="/var/log/ambari-logsearch-logfeeder/logfeeder.log"
+ENV LOGFEEDER_PID_FILE="/var/run/ambari-logsearch-logfeeder/logfeeder.pid"
+
+ENV LOGFEEDER_DEBUG=false
+ENV LOGFEEDER_DEBUG_PORT=5005
+ENV LOGFEEDER_SSL="false"
+
+RUN groupadd -r --gid
[ambari] branch trunk updated (0bad9fd -> 5853953)
This is an automated email from the ASF dual-hosted git repository. alexantonenko pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git. from 0bad9fd Merge pull request #2391 from hiveww/AMBARI-24702-trunk add 5badc12 AMBARI-22618. New daemon is not shown on Ambari UI even though added in metainfo.xml new 5853953 Merge pull request #2409 from hiveww/AMBARI-22618-trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ambari-web/app/models/stack_service_component.js | 4 ++-- ambari-web/test/models/stack_service_component_test.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
[ambari] 01/01: Merge pull request #2409 from hiveww/AMBARI-22618-trunk
This is an automated email from the ASF dual-hosted git repository. alexantonenko pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git commit 5853953471077b47bcdb8d3a8e2d9a49cb44deac Merge: 0bad9fd 5badc12 Author: Alexander Antonenko AuthorDate: Tue Oct 2 17:01:34 2018 +0300 Merge pull request #2409 from hiveww/AMBARI-22618-trunk AMBARI-22618. New daemon is not shown on Ambari UI even though added … ambari-web/app/models/stack_service_component.js | 4 ++-- ambari-web/test/models/stack_service_component_test.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
[ambari] branch trunk updated (6976220 -> 0bad9fd)
This is an automated email from the ASF dual-hosted git repository. alexantonenko pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git. from 6976220 [AMBARI-24718] STS fails after start, after stack upgrade from 3.0.1 … (#2406) add 10de300 AMBARI-24702. Cover alert_instances_popup view new 0bad9fd Merge pull request #2391 from hiveww/AMBARI-24702-trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ambari-web/app/assets/test/tests.js| 1 + .../main/alerts/alert_instances_popup_view_test.js | 144 + 2 files changed, 145 insertions(+) create mode 100644 ambari-web/test/views/main/alerts/alert_instances_popup_view_test.js
[ambari] 01/01: Merge pull request #2391 from hiveww/AMBARI-24702-trunk
This is an automated email from the ASF dual-hosted git repository. alexantonenko pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git commit 0bad9fdf5590d70e93d7474ded8a886d74215deb Merge: 6976220 10de300 Author: Alexander Antonenko AuthorDate: Tue Oct 2 15:51:35 2018 +0300 Merge pull request #2391 from hiveww/AMBARI-24702-trunk AMBARI-24702. Cover alert_instances_popup view ambari-web/app/assets/test/tests.js| 1 + .../main/alerts/alert_instances_popup_view_test.js | 144 + 2 files changed, 145 insertions(+)
[ambari-logsearch] branch master updated (de65e27 -> 14c0c79)
This is an automated email from the ASF dual-hosted git repository.
oleewere pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/ambari-logsearch.git.
from de65e27 Add LICENSE and references to original Ambari repository
add c35688a Add Log Searach container support
add 14c0c79 Use logsearch user for Log Search container
No new revisions were added by this update.
Summary of changes:
Makefile | 38
ambari-logsearch-it/pom.xml| 4 +-
ambari-logsearch-server/build.xml | 6 +++
ambari-logsearch-server/pom.xml| 19
.../containers/docker-logsearch-portal/Dockerfile | 53 ++
.../docker-logsearch-portal/bin/entrypoint.sh | 32 +
.../containers/docker-logsearch-portal/bin/init.sh | 4 +-
.../docker-logsearch-portal/conf}/log4j2.yml | 5 +-
.../docker-logsearch-portal/conf/logsearch-env.sh | 4 +-
.../conf}/logsearch.properties | 36 ---
pom.xml| 7 +++
11 files changed, 183 insertions(+), 25 deletions(-)
create mode 100644 Makefile
create mode 100644 jenkins/containers/docker-logsearch-portal/Dockerfile
create mode 100644 jenkins/containers/docker-logsearch-portal/bin/entrypoint.sh
copy ambari-logsearch-appender/build.properties =>
jenkins/containers/docker-logsearch-portal/bin/init.sh (90%)
copy {docker/test-config/logsearch =>
jenkins/containers/docker-logsearch-portal/conf}/log4j2.yml (93%)
copy ambari-logsearch-appender/build.properties =>
jenkins/containers/docker-logsearch-portal/conf/logsearch-env.sh (88%)
copy {docker/test-config/logsearch =>
jenkins/containers/docker-logsearch-portal/conf}/logsearch.properties (67%)
[ambari-infra] branch branch-feature-jenkins-test deleted (was 472bd9b)
This is an automated email from the ASF dual-hosted git repository. oleewere pushed a change to branch branch-feature-jenkins-test in repository https://gitbox.apache.org/repos/asf/ambari-infra.git. was 472bd9b Exclude .repository from rat check The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[GitHub] oleewere closed pull request #1: AMBARI-24721. Use maven docker plugin to build infra solr images
oleewere closed pull request #1: AMBARI-24721. Use maven docker plugin to build infra solr images URL: https://github.com/apache/ambari-infra/pull/1 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[ambari-infra] branch master updated: AMBARI-24721. Use maven docker plugin to build infra solr images (#1)
This is an automated email from the ASF dual-hosted git repository.
oleewere pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ambari-infra.git
The following commit(s) were added to refs/heads/master by this push:
new 12bc539 AMBARI-24721. Use maven docker plugin to build infra solr
images (#1)
12bc539 is described below
commit 12bc5391d8cea0ceb02cde07f3b396d6ad29b59d
Author: Olivér Szabó
AuthorDate: Tue Oct 2 11:18:30 2018 +0200
AMBARI-24721. Use maven docker plugin to build infra solr images (#1)
* Add docker push script.
* Test commit for use fabric docker plugin to push image
* Try out jdk instead of jre
* add Makefile + docker build changes for infra-solr
* Remove ls from Dockerfile
* Add .repository to .gitignore
* Exclude .repository from rat check
---
.gitignore | 1 +
Makefile | 32 +++
ambari-infra-assembly/pom.xml | 28 +-
ambari-infra-manager-it/pom.xml| 4 +-
jenkins/containers/docker-infra-solr/Dockerfile| 51 +++
.../containers/docker-infra-solr/bin/entrypoint.sh | 100 +
jenkins/containers/docker-infra-solr/bin/init.sh | 13 +++
.../docker-infra-solr/conf/infra-solr.conf | 17
jenkins/containers/docker-infra-solr/conf/solr.xml | 26 ++
pom.xml| 11 +--
10 files changed, 275 insertions(+), 8 deletions(-)
diff --git a/.gitignore b/.gitignore
index b48f609..9c77d11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
.classpath
.project
.settings
+.repository
.idea/
.iml/
.DS_Store
diff --git a/Makefile b/Makefile
new file mode 100644
index 000..8620dbe
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,32 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+GIT_REV_SHORT = $(shell git rev-parse --short HEAD)
+MAVEN_BINARY ?= mvn
+
+package:
+ $(MAVEN_BINARY) clean package
+
+test:
+ $(MAVEN_BINARY) clean test
+
+rpm:
+ $(MAVEN_BINARY) clean package -Dbuild-rpm -DskipTests
+
+deb:
+ $(MAVEN_BINARY) clean package -Dbuild-deb -DskipTests
+
+docker-build:
+ $(MAVEN_BINARY) clean package docker:build -DskipTests -Dbuild-deb
+
+docker-push:
+ $(MAVEN_BINARY) clean package docker:build docker:push -DskipTests
-Dbuild-deb
diff --git a/ambari-infra-assembly/pom.xml b/ambari-infra-assembly/pom.xml
index e2175b7..fe9d72e 100644
--- a/ambari-infra-assembly/pom.xml
+++ b/ambari-infra-assembly/pom.xml
@@ -45,6 +45,7 @@
http://central.maven.org/maven2/commons-fileupload/commons-fileupload/1.3.3/commons-fileupload-1.3.3.jar
commons-fileupload-1.3.3.jar
commons-fileupload-1.3.2.jar
+../jenkins/containers
@@ -391,17 +392,42 @@
-
+
+
+
+
+
+
+
+
+
+
+
+io.fabric8
+docker-maven-plugin
+
+ true
+
+
+ apache/ambari-infra-solr:latest
+
+
${project.build.directory}/docker-infra-solr
+
+
+
+
+
diff --git a/ambari-infra-manager-it/pom.xml b/ambari-infra-manager-it/pom.xml
index c9b8bad..2fac6a9 100644
--- a/ambari-infra-manager-it/pom.xml
+++ b/ambari-infra-manager-it/pom.xml
@@ -34,7 +34,7 @@
4.0.5
2.20
-localhost
+localhost
NONE
@@ -202,7 +202,7 @@
file:${project.build.testOutputDirectory}/log4j.properties
-${docker.host}
+${infra-manager.docker.host}
${stories.location}
diff --git a/jenkins/containers/docker-infra-solr/Dockerfile
b/jenkins/containers/docker-infra-solr/Dockerfile
new file mode 100644
index 000..cdab2cc
--- /dev/null
+++ b/jenkins/containers/docker-infra-solr/Dockerfile
@@ -0,0 +1,51 @@
[GitHub] asfgit commented on issue #1: AMBARI-24721. Use maven docker plugin to build infra solr images
asfgit commented on issue #1: AMBARI-24721. Use maven docker plugin to build infra solr images URL: https://github.com/apache/ambari-infra/pull/1#issuecomment-426197268 Refer to this link for build results (access rights to CI server needed): https://builds.apache.org/job/Ambari-Infra-Github-PR-Builder/1/ Test PASSed. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] oleewere opened a new pull request #1: AMBARI-24721. Use maven docker plugin to build infra solr images
oleewere opened a new pull request #1: AMBARI-24721. Use maven docker plugin to build infra solr images URL: https://github.com/apache/ambari-infra/pull/1 ## What changes were proposed in this pull request? Use maven docker plugin to build and publish images. Add Makefile for builds Additional fix: use right metrics version for deb/rpm install ## How was this patch tested? Manually and on jenkins Please review @g-boros @kasakrisz This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
