From c08eb88e1364694835fadb0a91161832d05d4dab Mon Sep 17 00:00:00 2001
From: Trey Hayden <33755714+vbhayden@users.noreply.github.com>
Date: Thu, 21 Mar 2024 11:49:19 -0400
Subject: [PATCH 1/4] fixes to cts + cypress tests

---
 .github/workflows/cicd.yml    | 5 ++++-
 tests/cypress/e2e/login.cy.js | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 8fa42bd7..0b061d1b 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -42,10 +42,13 @@ jobs:
       LRS_PASSWORD: ${{ secrets.ADLNET_STAGING_LRS_PASSWORD }}
       LRS_HOST_URL: ${{ secrets.ADLNET_STAGING_LRS_HOST_URL }}
     steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        
       - name: Cypress run
         uses: cypress-io/github-action@v6
         with:
-          working-directory: tests/cypress
+          working-directory: ./tests/cypress
 
   conformance-testing:
     runs-on: ubuntu-latest
diff --git a/tests/cypress/e2e/login.cy.js b/tests/cypress/e2e/login.cy.js
index 2bc54d1f..f10b7b74 100644
--- a/tests/cypress/e2e/login.cy.js
+++ b/tests/cypress/e2e/login.cy.js
@@ -6,8 +6,8 @@ describe("Logged-In Behavior", () => {
   
     it("Allows Admin to Log In.", () => {
       
-      let adminName = Cypress.env("LRS_ADMIN_NAME");
-      let adminPass = Cypress.env("LRS_ADMIN_PASS");
+      let adminName = Cypress.env("LRS_USERNAME");
+      let adminPass = Cypress.env("LRS_PASSWORD");
       
       cy.get('#menuLink1').click();
 

From a4f700de3ce50949c193c96a4787d79e65afa552 Mon Sep 17 00:00:00 2001
From: Trey Hayden <33755714+vbhayden@users.noreply.github.com>
Date: Thu, 21 Mar 2024 11:57:37 -0400
Subject: [PATCH 2/4] adding health check to staging deployment

---
 .github/workflows/cicd.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 0b061d1b..a3e7e1fc 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -31,6 +31,13 @@ jobs:
           sudo docker-compose up -d
           echo 'deployed successfully on server' "
 
+      - name: Check the deployed service URL
+        uses: jtalk/url-health-check-action@v4
+        with:
+          url: ${{ secrets.ADLNET_STAGING_HOST }}
+          max-attempts: 10
+          retry-delay: 10s
+
   cypress-testing:
     name: Cypress run
     environment: staging

From 60bf866fd72d891d8c3054837413698685e614f4 Mon Sep 17 00:00:00 2001
From: Trey Hayden <33755714+vbhayden@users.noreply.github.com>
Date: Thu, 21 Mar 2024 12:00:44 -0400
Subject: [PATCH 3/4] fixing healthcheck url var

---
 .github/workflows/cicd.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index a3e7e1fc..e029549e 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -34,7 +34,7 @@ jobs:
       - name: Check the deployed service URL
         uses: jtalk/url-health-check-action@v4
         with:
-          url: ${{ secrets.ADLNET_STAGING_HOST }}
+          url: ${{ secrets.ADLNET_STAGING_LRS_HOST_URL }}
           max-attempts: 10
           retry-delay: 10s
 

From 692eb247d3da622f50403c56e88b280a9752729f Mon Sep 17 00:00:00 2001
From: Trey Hayden <33755714+vbhayden@users.noreply.github.com>
Date: Thu, 4 Apr 2024 11:37:55 -0400
Subject: [PATCH 4/4] checking backwards compatibility branch of cts

---
 .github/workflows/cicd.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index e029549e..c821e14a 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -74,7 +74,7 @@ jobs:
           owner: adlnet
           repository: lrs-conformance-test-suite
           depth: 1
-          branch: master
+          branch: adding-back-compat
 
       - name: Run LRS Conformance Suite
         run: |