Consume ensure-java role from upstream Also remove the test: test-ensure-java. Change-Id: I43c60a657a05ba858ac6c18d6953d02780066833
diff --git a/playbooks/test-ensure-java.yaml b/playbooks/test-ensure-java.yaml deleted file mode 100644 index fd73370..0000000 --- a/playbooks/test-ensure-java.yaml +++ /dev/null
@@ -1,6 +0,0 @@ -- hosts: all - roles: - - ensure-java - tasks: - - name: Print java version - command: java -fullversion
diff --git a/roles/ensure-java/README.rst b/roles/ensure-java/README.rst deleted file mode 100644 index 08eeb43..0000000 --- a/roles/ensure-java/README.rst +++ /dev/null
@@ -1,10 +0,0 @@ -Ensure that Java is installed - -Installs the specified version of the JDK. - -**Role Variables** - -.. zuul:rolevar:: java_version - :default: 8 - - Version of Java to install.
diff --git a/roles/ensure-java/defaults/main.yaml b/roles/ensure-java/defaults/main.yaml deleted file mode 100644 index 9ed782d..0000000 --- a/roles/ensure-java/defaults/main.yaml +++ /dev/null
@@ -1 +0,0 @@ -java_version: 8
diff --git a/roles/ensure-java/tasks/main.yaml b/roles/ensure-java/tasks/main.yaml deleted file mode 100644 index a0d4366..0000000 --- a/roles/ensure-java/tasks/main.yaml +++ /dev/null
@@ -1,5 +0,0 @@ -- name: Install JDK - become: true - package: - name: openjdk-{{ java_version }}-jdk - state: present
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 12c9c7c..b5e2610 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml
@@ -2,7 +2,6 @@ check: jobs: - test-ensure-bazelisk - - test-ensure-java - test-gerrit-setup - test-install-build-essential - test-gerrit-plugin-build
diff --git a/zuul.d/test-jobs.yaml b/zuul.d/test-jobs.yaml index 9f082ee..e351678 100644 --- a/zuul.d/test-jobs.yaml +++ b/zuul.d/test-jobs.yaml
@@ -8,13 +8,6 @@ - playbooks/test-ensure-bazelisk.yaml - job: - name: test-ensure-java - run: playbooks/test-ensure-java.yaml - files: - - roles/ensure-java/.* - - playbooks/test-ensure-java.yaml - -- job: name: test-install-build-essential run: playbooks/test-install-build-essential.yaml files: