From d4920428ef498d5537cd7e18269887c59610ef42 Mon Sep 17 00:00:00 2001
From: ramonskie <ramonmakkelie@gmail.com>
Date: Mon, 4 Dec 2023 14:59:55 +0100
Subject: [PATCH] reorder tasks so the old behevior of tagging is kept before
 the reorder of these tasks the version-tag/tag was set by the latest task in
 this case the fips build.

---
 pipelines/ubuntu-jammy/pipeline.yml | 33 ++++++++++++++---------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/pipelines/ubuntu-jammy/pipeline.yml b/pipelines/ubuntu-jammy/pipeline.yml
index eacb5e3..d3c70c0 100644
--- a/pipelines/ubuntu-jammy/pipeline.yml
+++ b/pipelines/ubuntu-jammy/pipeline.yml
@@ -256,7 +256,6 @@ jobs:
     params:
       OPERATING_SYSTEM_NAME: ubuntu
       OPERATING_SYSTEM_VERSION: (@= stemcell.os @)
-      #! UBUNTU_ADVANTAGE_TOKEN: ((ubuntu_advantage_token))
     privileged: true
     vars:
       image_os_tag: (@= stemcell.os @)
@@ -551,6 +550,22 @@ jobs:
       trigger: true
   - task: assert-version-aligns
     file: bosh-stemcells-ci/tasks/assert-version-aligns.yml
+  - task: copy-fips-artifacts
+    file: bosh-stemcells-ci/tasks/publish.yml
+    params:
+      AWS_ACCESS_KEY_ID: ((hmac_accesskey))
+      AWS_SECRET_ACCESS_KEY: ((hmac_secret))
+      COMMIT_PREFIX: candidate
+      COPY_KEYS: |
+        aws/bosh-stemcell-%s-aws-xen-hvm-ubuntu-(@= stemcell.os @)-fips-go_agent.tgz
+      FROM_BUCKET_NAME: bosh-core-stemcells-candidate-fips
+      FROM_INDEX: dev
+      OS_NAME: ubuntu
+      OS_VERSION: (@= stemcell.os @)-fips
+      TO_BUCKET_NAME: bosh-core-stemcells-candidate-fips
+      TO_INDEX: candidate
+      AWS_ENDPOINT: "https://storage.googleapis.com"
+      S3_API_ENDPOINT: storage.googleapis.com
   - task: copy-artifacts
     file: bosh-stemcells-ci/tasks/publish.yml
     params:
@@ -574,22 +589,6 @@ jobs:
       TO_INDEX: candidate
       AWS_ENDPOINT: "https://storage.googleapis.com"
       S3_API_ENDPOINT: storage.googleapis.com
-  - task: copy-fips-artifacts
-    file: bosh-stemcells-ci/tasks/publish.yml
-    params:
-      AWS_ACCESS_KEY_ID: ((hmac_accesskey))
-      AWS_SECRET_ACCESS_KEY: ((hmac_secret))
-      COMMIT_PREFIX: candidate
-      COPY_KEYS: |
-        aws/bosh-stemcell-%s-aws-xen-hvm-ubuntu-(@= stemcell.os @)-fips-go_agent.tgz
-      FROM_BUCKET_NAME: bosh-core-stemcells-candidate-fips
-      FROM_INDEX: dev
-      OS_NAME: ubuntu
-      OS_VERSION: (@= stemcell.os @)-fips
-      TO_BUCKET_NAME: bosh-core-stemcells-candidate-fips
-      TO_INDEX: candidate
-      AWS_ENDPOINT: "https://storage.googleapis.com"
-      S3_API_ENDPOINT: storage.googleapis.com
   - in_parallel:
     - put: bosh-linux-stemcell-builder-push-(@= stemcell.version @)
       params: