Merge pull request #319 from jgsogo/jenkins/slave

conan-io · Oct 1, 2021 · 6faff47 · 6faff47
2 parents b0e24f7 + b693dc3
commit 6faff47
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/.ci/xenial.jenkinsfile b/.ci/xenial.jenkinsfile
@@ -158,7 +158,7 @@ node('Linux') {
                     String latestMaster = "${dockerUsername}/${compiler}${versionMajor}-${distro}-jenkins:${targetBranch}-latest"
 
                     dir('modern/jenkins') {
-                        buildImage(latestMaster, latestBranch, jenkinsImage, "--build-arg SOURCE_CONANIO_IMAGE=${deployImage}")
+                        buildImage(latestMaster, latestBranch, jenkinsImage, "${compilerArgs} --build-arg SOURCE_CONANIO_IMAGE=${deployImage}")
                     }
 
                     dir('modern') {

diff --git a/modern/tests/test_installed/test_jenkins.py b/modern/tests/test_installed/test_jenkins.py
@@ -0,0 +1,15 @@
+import pytest
+
+
+@pytest.mark.service('jenkins')
+class TestJenkinsAgent:
+
+    def test_java(self, container):
+        out, err = container.exec(['java', '-version'])
+        # Check Java, up to minor version
+        assert 'openjdk version "1.8' in err, f"out: '{out}' err: '{err}'"
+
+    def test_entrypoint(self, container):
+        out, err = container.exec(['/opt/entrypoint.sh'])
+        # It shows help (missing arguments), but we know it works
+        assert 'java -jar agent.jar [options...] <secret key> <agent name>' in err, f"out: '{out}' err: '{err}'"