From 4d3e1af07ca1a85bb3f633d8ae9b9a43cd8a71b5 Mon Sep 17 00:00:00 2001
From: Nikita Shyrei <nikitas2209@gmail.com>
Date: Mon, 7 Oct 2024 11:46:01 +0200
Subject: [PATCH] Change paths of private artifact dependencies to a public
 ones (#17)

* - init

* - changed tests container buffer path

* - code review changes

* Revert "- code review changes"

This reverts commit 85c3edea9f77f09c96b4d009395f1b1e7d9e3f1f.
---
 build-app-tests-container.sh                         | 2 +-
 docker/build-enclave-kernel.sh                       | 2 +-
 make/salmiac-tests-container.make                    | 2 +-
 run-application-tests.sh                             | 4 ++--
 test/tests-container-salmiac/Dockerfile-salmiac-ub20 | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build-app-tests-container.sh b/build-app-tests-container.sh
index 79ea7de..b24927b 100755
--- a/build-app-tests-container.sh
+++ b/build-app-tests-container.sh
@@ -10,7 +10,7 @@ FLAVOR=debug
 if [ -z "$SKIP_RUNNING_TESTS" ]; then
   make tests-container FLAVOR=$FLAVOR
   TESTS_CONTAINER_TAG=$(cat build/nitro-$FLAVOR/tests-container-tag)
-  TESTS_CONTAINER_ECR="513076507034.dkr.ecr.us-west-1.amazonaws.com/development-images/$TESTS_CONTAINER_TAG"
+  TESTS_CONTAINER_ECR="513076507034.dkr.ecr.us-west-1.amazonaws.com/salmiac-github-ci/$TESTS_CONTAINER_TAG"
 
   docker load -i build/nitro-$FLAVOR/salmiac-tests-container.tar.gz
   docker tag $TESTS_CONTAINER_TAG $TESTS_CONTAINER_ECR
diff --git a/docker/build-enclave-kernel.sh b/docker/build-enclave-kernel.sh
index e502b7a..253b5d6 100755
--- a/docker/build-enclave-kernel.sh
+++ b/docker/build-enclave-kernel.sh
@@ -7,7 +7,7 @@ set -exo pipefail
 ARTIFACT_NAME="amzn-linux-nbd-v1.tar"
 ARTIFACT_DIR="amzn-linux-nbd"
 fetchartifacts() {
-  aws s3 cp s3://fortanix-internal-artifact-repository/salmiac/$ARTIFACT_NAME .
+  aws s3 cp s3://downloads.fortanix.com/salmiac/$ARTIFACT_NAME .
   tar -xvf $ARTIFACT_NAME
 }
 
diff --git a/make/salmiac-tests-container.make b/make/salmiac-tests-container.make
index 1e37471..6a1e870 100644
--- a/make/salmiac-tests-container.make
+++ b/make/salmiac-tests-container.make
@@ -93,7 +93,7 @@ $(eval $(call make-cp-rule,$(REPO_ROOT)/tools/app-test-inrfa/bin/tests-container
 $(eval $(call make-cp-rule,$(REPO_ROOT)/tools/app-test-infra/bin/tests-container-run.py,$(TESTS-STAGE-DIR)/tests-container-run.py))
 $(eval $(call make-cp-rule,$(REPO_ROOT)/test/tests-container-salmiac/docker-config.json,$(TESTS-STAGE-DIR)/docker-config.json))
 $(eval $(call make-cp-rule,$(REPO_ROOT)/tools/container-converter/target/$(FLAVOR)/container-converter,$(TESTS-STAGE-DIR)/container-converter))
-$(eval $(call pull-s3,s3\://fortanix-internal-artifact-repository/salmiac/$(ENCLAVE-KERNEL-TAR),$(TESTS-STAGE-DIR)/$(ENCLAVE-KERNEL-TAR)))
+$(eval $(call pull-s3,s3\://downloads.fortanix.com/salmiac/$(ENCLAVE-KERNEL-TAR),$(TESTS-STAGE-DIR)/$(ENCLAVE-KERNEL-TAR)))
 $(eval $(call untar-pkg,$(TESTS-STAGE-DIR)/$(ENCLAVE-KERNEL-TAR),$(TESTS-STAGE-DIR)/amzn-linux-nbd))
 
 # This generates the rules for copying the contents of tools/app-test-infra/python
diff --git a/run-application-tests.sh b/run-application-tests.sh
index 70b01b3..7cf9cf8 100755
--- a/run-application-tests.sh
+++ b/run-application-tests.sh
@@ -15,10 +15,10 @@ echo "AWS_CREDENTIALS=$(/usr/bin/base64 --wrap=0 < ~/.aws/credentials)" >> docke
 ECR_PASSWORD=$(aws ecr get-login-password --region us-west-1)
 echo "ECR_PASSWORD=$ECR_PASSWORD" >> docker-env
 
-PARENT_IMAGE=513076507034.dkr.ecr.us-west-1.amazonaws.com/nitro-parent-base:1.1.1
+PARENT_IMAGE=fortanix/nitro-parent-base:1.1.4
 echo "PARENT_IMAGE=$PARENT_IMAGE" >> docker-env
 
-ENCLAVE_IMAGE=513076507034.dkr.ecr.us-west-1.amazonaws.com/nitro-enclave-base:1.0.1
+ENCLAVE_IMAGE=fortanix/nitro-enclave-base:1.0.2
 echo "ENCLAVE_IMAGE=$ENCLAVE_IMAGE" >> docker-env
 
 echo "FORTANIX_API_KEY=$FORTANIX_API_KEY" >> docker-env
diff --git a/test/tests-container-salmiac/Dockerfile-salmiac-ub20 b/test/tests-container-salmiac/Dockerfile-salmiac-ub20
index f25bfe5..439bf65 100644
--- a/test/tests-container-salmiac/Dockerfile-salmiac-ub20
+++ b/test/tests-container-salmiac/Dockerfile-salmiac-ub20
@@ -1,4 +1,4 @@
-FROM 513076507034.dkr.ecr.us-west-1.amazonaws.com/development-images/nitro-parent-base:1.1.4 as nitro-cli
+FROM fortanix/nitro-parent-base:1.1.4 as nitro-cli
 
 ARG PLATFORM
 ARG FLAVOR