Merge pull request #72 from awslabs/ref_repo_updates

Ref repo updates
awslabs · Jan 29, 2024 · 7042dde · 7042dde
2 parents e70e4ce + 15e43c8
commit 7042dde
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 0 deletions.
diff --git a/backstage-reference/common/cicd/.gitlab-ci-aws-iac-eks-kubectl.yml b/backstage-reference/common/cicd/.gitlab-ci-aws-iac-eks-kubectl.yml
@@ -109,6 +109,8 @@
     - echo -e "\e[0Ksection_start:`date +%s`:catalog[collapsed=true]\r\e[0KGetting the latest catalog-info.yaml contents"
     # We need the latest catalog-info.yaml contents in case this pipeline modified this file in an earlier stage
     - git checkout $CI_COMMIT_BRANCH
+    # Make sure that unmerged commits from previous failed executions of the pipeline are cleared out
+    - git reset --hard origin/$CI_COMMIT_BRANCH
     - git pull
     - export LATEST_CATALOG_INFO="$(cat $CI_PROJECT_DIR/.backstage/catalog-info.yaml)"
     - git checkout $CI_COMMIT_SHA # put our files back to where they were when the pipeline started

diff --git a/backstage-reference/common/cicd/.gitlab-ci-aws-iac-eks.yml b/backstage-reference/common/cicd/.gitlab-ci-aws-iac-eks.yml
@@ -109,6 +109,8 @@
     - echo -e "\e[0Ksection_start:`date +%s`:catalog[collapsed=true]\r\e[0KGetting the latest catalog-info.yaml contents"
     # We need the latest catalog-info.yaml contents in case this pipeline modified this file in an earlier stage
     - git checkout $CI_COMMIT_BRANCH
+    # Make sure that unmerged commits from previous failed executions of the pipeline are cleared out
+    - git reset --hard origin/$CI_COMMIT_BRANCH
     - git pull
     - export LATEST_CATALOG_INFO="$(cat $CI_PROJECT_DIR/.backstage/catalog-info.yaml)"
     - git checkout $CI_COMMIT_SHA # put our files back to where they were when the pipeline started

diff --git a/backstage-reference/common/cicd/.gitlab-ci-aws-iac-serverless-api.yml b/backstage-reference/common/cicd/.gitlab-ci-aws-iac-serverless-api.yml
@@ -74,6 +74,9 @@
     - export AWS_SECRET_ACCESS_KEY=$(echo ${ROLE_OUTPUT} | jq -r '.Credentials.SecretAccessKey')
     - export AWS_SESSION_TOKEN=$(echo ${ROLE_OUTPUT} | jq -r '.Credentials.SessionToken')
     - aws sts get-caller-identity
+    - apt-get install python3.11-venv -y
+    - python3 -m venv .venv
+    - source .venv/bin/activate
     - pip3 install aws-sam-cli --upgrade
     - sam build
     - echo "sam package will upload to S3 bucket \"$BuildBucketName\""

diff --git a/website/static/img/gitlab_marketplace.png b/website/static/img/gitlab_marketplace.png