refactor: use prerelease instead of build

Until moby/moby#16304
krestomatio · Nov 27, 2020 · f60476a · f60476a
1 parent 2aa6e1a
commit f60476a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/.ansible-ci/tasks/prepare/moodle.yml b/.ansible-ci/tasks/prepare/moodle.yml
@@ -10,4 +10,4 @@
     version_image_major: "{{ moodle_git_source_version.split('.')[0] | default(false) }}"
     version_image_minor: "{{ moodle_git_source_version.split('.')[1] | default(false) }}"
     version_image_patch: "{{ moodle_git_source_version.split('.')[2] | default(false) }}"
-    version_image_build: "{{ moodle_git_commit[0:7] | default(false) }}"
+    version_image_prerelease: "{{ moodle_git_commit[0:7] | default(false) }}"
diff --git a/.ansible-ci/vars/pipeline/build.yml b/.ansible-ci/vars/pipeline/build.yml
@@ -4,9 +4,7 @@ pr_commit_tag:
   default(lookup('pipe', 'git rev-parse HEAD 2> /dev/null  || echo')) |
   default(false) }}"
 version_commit_tag: "{{ pr_commit_tag }}"
-version_image_prerelease: "{{ lookup('env','BRANCH_NAME') |
-default(false,true) }}"
-version_image_build: "{{ lookup('env','BUILD_ID') | default(version_commit_tag[:7],true) | default(false) }}"
+version_image_prerelease: "{{ lookup('env','PRERELEASE') | default(version_commit_tag[:7],true) | default(false) }}"
 artifact_tag: "{{ pr_commit_tag }}"
 state_yml_artifact_tag: "{{ artifact_tag }}"
 assertion_artifact_tag: true