From 55943c96bc84049c8c1a1d194e49789f49e7e310 Mon Sep 17 00:00:00 2001 From: Pavel Vetokhin Date: Fri, 23 Feb 2024 10:32:27 +0300 Subject: [PATCH] Define devenv in pom file --- app/pom.xml | 10 ++-- .../inventory/group_vars/all/envs.yaml | 12 ----- baker/ansible/sources.yaml | 2 +- baker/ansible/stacks.yaml | 4 +- baker/ansible/tasks/app/build-and-check.yaml | 7 +-- baker/ansible/tasks/gear/build.yaml | 8 ++- baker/ansible/tasks/product/build.yaml | 7 +++ baker/ansible/tasks/product/check.yaml | 6 +-- baker/ansible/tasks/product/clean.yaml | 12 +++++ pom.xml | 49 +++++++++++++++++-- 10 files changed, 85 insertions(+), 32 deletions(-) create mode 100644 baker/ansible/tasks/product/clean.yaml diff --git a/app/pom.xml b/app/pom.xml index 3f80500a..dc2e8dec 100644 --- a/app/pom.xml +++ b/app/pom.xml @@ -66,7 +66,7 @@ maven-dependency-plugin - deps-context + deps-jars pre-integration-test copy-dependencies @@ -78,7 +78,7 @@ - lib-context + libs-jars pre-integration-test copy-dependencies @@ -90,7 +90,7 @@ - app-context + app-jar pre-integration-test copy @@ -128,9 +128,9 @@ --file ${project.basedir}/Dockerfile --tag - app/${project.artifactId}:godel + app/${artifactId}:${devenv} --label - image.key=app/${project.artifactId}/godel + image.key=app/${artifactId}/${devenv} --build-arg JAVA_RELEASE=${maven.compiler.release} diff --git a/baker/ansible/inventory/group_vars/all/envs.yaml b/baker/ansible/inventory/group_vars/all/envs.yaml index 21137db5..a292d83b 100644 --- a/baker/ansible/inventory/group_vars/all/envs.yaml +++ b/baker/ansible/inventory/group_vars/all/envs.yaml @@ -1,17 +1,5 @@ --- devenv: turing -dev: - church: - jdk: - release: 21 - kotlin: - version: 2.0.0-Beta4 - turing: - jdk: - release: 21 - godel: - jdk: - release: 17 opsenv: durkheim ops: diff --git a/baker/ansible/sources.yaml b/baker/ansible/sources.yaml index 2d213bda..97a74dcd 100644 --- a/baker/ansible/sources.yaml +++ b/baker/ansible/sources.yaml @@ -14,7 +14,7 @@ pmd:check compiler:compile spotbugs:check - --define maven.compiler.release={{ dev[devenv].jdk.release }} + --define devenv={{ devenv }} chdir: "{{ project.dir }}" strip_empty_ends: false changed_when: false diff --git a/baker/ansible/stacks.yaml b/baker/ansible/stacks.yaml index 2b9a44af..e938da24 100644 --- a/baker/ansible/stacks.yaml +++ b/baker/ansible/stacks.yaml @@ -20,7 +20,9 @@ - ansible.builtin.import_tasks: # noqa: name[missing] file: tasks/gear/build.yaml tags: [build] - when: hostvars.gear.stack_status is changed + when: >- + hostvars.gear.stack_status is changed and + repo_mode != 'rw' - name: Building & Checking hosts: product diff --git a/baker/ansible/tasks/app/build-and-check.yaml b/baker/ansible/tasks/app/build-and-check.yaml index ba646387..56e9bc16 100644 --- a/baker/ansible/tasks/app/build-and-check.yaml +++ b/baker/ansible/tasks/app/build-and-check.yaml @@ -16,11 +16,8 @@ }} --also-make clean - {{ maven_phase|mandatory }} - --define maven.compiler.release={{ dev[devenv].jdk.release }} - {% if dev[devenv].kotlin is defined %} - --define kotlin.version={{ dev[devenv].kotlin.version }} - {% endif %} + {{ maven_phase | mandatory }} + --define devenv={{ devenv }} chdir: "{{ project.dir }}" strip_empty_ends: false changed_when: true diff --git a/baker/ansible/tasks/gear/build.yaml b/baker/ansible/tasks/gear/build.yaml index 73f160ab..60be7f7b 100644 --- a/baker/ansible/tasks/gear/build.yaml +++ b/baker/ansible/tasks/gear/build.yaml @@ -1,4 +1,11 @@ --- +- ansible.builtin.import_role: # noqa: name[missing] + name: image + tasks_from: clean + vars: + image_keys: + - "{{ gear.image }}/{{ devenv }}" + - ansible.builtin.import_role: # noqa: name[missing] name: image tasks_from: build @@ -6,4 +13,3 @@ image_home: "{{ project.dir }}/stack/gear" image_key: "{{ gear.image }}/{{ devenv }}" image_tag: "{{ gear.image }}:{{ devenv }}" - when: repo_mode != 'rw' diff --git a/baker/ansible/tasks/product/build.yaml b/baker/ansible/tasks/product/build.yaml index 0db6aad7..2b51e7bf 100644 --- a/baker/ansible/tasks/product/build.yaml +++ b/baker/ansible/tasks/product/build.yaml @@ -1,4 +1,11 @@ --- +- ansible.builtin.import_role: # noqa: name[missing] + name: image + tasks_from: clean + vars: + image_keys: + - "{{ product.image }}/{{ opsenv }}" + - name: Remove artifacts ansible.builtin.file: path: "{{ stack_dir }}/target" diff --git a/baker/ansible/tasks/product/check.yaml b/baker/ansible/tasks/product/check.yaml index bb4110ca..bd7e5754 100644 --- a/baker/ansible/tasks/product/check.yaml +++ b/baker/ansible/tasks/product/check.yaml @@ -34,12 +34,14 @@ --batch-mode --threads 2 --projects test/e2e - {% if is_docker_gear.rc == 0 %} + {% if hostvars.gear.is_docker_gear.rc == 0 %} --activate-profiles docker {% endif %} --also-make clean test + --define devenv={{ devenv }} + --define skipUnits=true --define props={{ opsenv }} {% if reminder is defined %} --define testing.sharding.reminder={{ reminder }} @@ -47,8 +49,6 @@ {% if modulus is defined %} --define testing.sharding.modulus={{ modulus }} {% endif %} - --define maven.compiler.release={{ dev[devenv].jdk.release }} - --define skipUnits=true chdir: "{{ project.dir }}" strip_empty_ends: false changed_when: true diff --git a/baker/ansible/tasks/product/clean.yaml b/baker/ansible/tasks/product/clean.yaml new file mode 100644 index 00000000..bdfb10bc --- /dev/null +++ b/baker/ansible/tasks/product/clean.yaml @@ -0,0 +1,12 @@ +--- +- name: Remove artifacts + ansible.builtin.file: + path: "{{ stack_dir }}/target" + state: absent + +- ansible.builtin.import_role: # noqa: name[missing] + name: image + tasks_from: clean + vars: + image_keys: + - "{{ product.image }}/{{ opsenv }}" diff --git a/pom.xml b/pom.xml index 6c8ca452..86fa80e3 100644 --- a/pom.xml +++ b/pom.xml @@ -23,14 +23,55 @@ 6.1.3 1.9.22 0.8.11 - - false - - ${skipTests} + godel + false + ${skipTests} 17 UTF-8 + + + experimental + + + devenv + church + + + + 22 + 2.0.0-Beta4 + + + + stable + + + devenv + turing + + + + 21 + 1.9.22 + + + + deprecated + + + devenv + godel + + + + 17 + 1.8.22 + + + +