ci: improve tests to pass with workflow_dispatch event

Signed-off-by: Emilien Escalle <[email protected]>

Author: neilime

.github/workflows/__test-action-docker-build-image.yml

@@ -109,35 +109,43 @@ jobs:
               `"annotations.org.opencontainers.image.url" output is not valid`
             );
 
+            const expectedTags = [];
+            let expectedImageVersion;
             if (`${{ github.event_name }}` === "pull_request") {
               const shortSha = `${{ github.sha }}`.substring(0, 7);
               const prShaTag = `pr-${{ github.event.pull_request.number }}-${shortSha}`;
               const prTag = `pr-${{ github.event.pull_request.number }}`;
 
-              assert.equal(builtImage.tags.length, 2, `"tags" output is not valid`);
-
-              assert.equal(builtImage.tags[0], prShaTag, `"tags" output is not valid`);
-              assert.equal(builtImage.tags[1], prTag, `"tags" output is not valid`);
-
-              assert.equal(
-                builtImage.annotations["org.opencontainers.image.version"],
-                prTag,
-                `"annotations.org.opencontainers.image.version" output is not valid`
-              );
+              expectedTags.push(prShaTag, prTag);
+              expectedImageVersion = prShaTag;
             } else {
               const refTag = `${{ github.ref_name }}`;
+              expectedTags.push(refTag);
+              expectedImageVersion = refTag;
 
-              assert.equal(builtImage.tags.length, 2, `"tags" output is not valid`);
-              assert.equal(builtImage.tags[0], refTag, `"tags" output is not valid`);
-              assert.equal(builtImage.tags[1], "latest", `"tags" output is not valid`);
+              if (`${{ github.event_name }}` !== "workflow_dispatch") {
+                expectedTags.push("latest");
+              }
+            }
 
-              assert.equal(
-                builtImage.annotations["org.opencontainers.image.version"],
-                refTag,
-                `"annotations.org.opencontainers.image.version" output is not valid`
-              );
+            assert.equal(
+              builtImage.tags.length,
+              expectedTags.length,
+              `"tags" output is not valid, expected ${expectedTags.length} tags but got ${builtImage.tags.length}`
+            );
+
+            for (const expectedTag of expectedTags) {
+              if (!builtImage.tags.includes(expectedTag)) {
+                assert.fail(`Expected tag "${expectedTag}" not found in "tags" output`);
+              }
             }
 
+            assert.equal(
+              builtImage.annotations["org.opencontainers.image.version"],
+              refTag,
+              `"annotations.org.opencontainers.image.version" output is not valid`
+            );
+
       - uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
         with:
           registry: ghcr.io

.github/workflows/__test-action-get-image-metadata.yml

@@ -77,31 +77,33 @@ jobs:
             const tags = tagsOutput.split("\n").filter(Boolean);
             assert(tags.length, `"tags" output is empty`);
 
-            if (`${{ github.event_name }}` === "pull_request") {
-              assert.equal(
-                tags.length,
-                2,
-                `"tags" output must contain 2 tags for pull_request event`
-              );
+            const expectedTags = [];
 
-              assert(
-                tags[0].startsWith("ghcr.io/hoverkraft-tech/ci-github-container/application-test:pr-${{ github.event.pull_request.number }}-"),
-                `"tags" output is not valid`
-              );
+            if (`${{ github.event_name }}` === "pull_request") {
+              const shortSha = `${{ github.sha }}`.substring(0, 7);
+              const prShaTag = `pr-${{ github.event.pull_request.number }}-${shortSha}`;
+              const prTag = `pr-${{ github.event.pull_request.number }}`;
 
-              assert.equal(
-                tags[1],
-                "ghcr.io/hoverkraft-tech/ci-github-container/application-test:pr-${{ github.event.pull_request.number }}", `"tags" output is not valid`
-              );
+              expectedTags.push(prShaTag, prTag);
             } else {
-              assert.equal(
-                tags.length,
-                2,
-                `"tags" output must contain 2 tags for push event`
-              );
+              expectedTags.push("main");
+              if (`${{ github.event_name }}` !== "workflow_dispatch") {
+                expectedTags.push("latest");
+              }
+            }
+
+            assert.equal(
+              tags.length,
+              expectedTags.length,
+              `"tags" output must contain ${expectedTags.length} tags for ${{ github.event_name }} event`
+            );
 
-              assert.equal(tags[0],"ghcr.io/hoverkraft-tech/ci-github-container/application-test:main", `"tags" output is not valid`);
-              assert.equal(tags[1],"ghcr.io/hoverkraft-tech/ci-github-container/application-test:latest", `"tags" output is not valid`);
+            for(const expectedTag of expectedTags) {
+              const fullTag = `ghcr.io/hoverkraft-tech/ci-github-container/application-test:${expectedTag}`;
+              assert(
+                tags.includes(fullTag),
+                `Expected tag "${fullTag}" not found in "tags" output`
+              );
             }
 
   tests-with-given-tag: