refine fmt

varshith257 · Sep 22, 2024 · f61e0f2 · f61e0f2
1 parent 5c99993
commit f61e0f2
Showing 1 changed file with 27 additions and 25 deletions.
diff --git a/.github/workflows/ci2.yml b/.github/workflows/ci2.yml
@@ -82,8 +82,7 @@ jobs:
 
       - name: Verify Docker Installation
         run: docker --version
-             docker info
-
+          docker info
 
       # Step 8: Install Poetry and Dependencies
       - name: Install Poetry and Dependencies
@@ -102,36 +101,39 @@ jobs:
 
       - name: Set All Environment Variables for Testbed
         run: |
-            echo "openresty_http_port=8080" >> $GITHUB_ENV
-            echo "openresty_https_port=8443" >> $GITHUB_ENV
-            echo "apache_http_port=8081" >> $GITHUB_ENV
-            echo "apache_https_port=8444" >> $GITHUB_ENV
-            echo "nginx_http_port=8082" >> $GITHUB_ENV
-            echo "nginx_https_port=8445" >> $GITHUB_ENV
-            echo "jetty_http_port=8083" >> $GITHUB_ENV
-            echo "jetty_https_port=8446" >> $GITHUB_ENV
-            echo "tomcat_http_port=8084" >> $GITHUB_ENV
-            echo "tomcat_https_port=8447" >> $GITHUB_ENV
-            echo "openlitespeed_http_port=8085" >> $GITHUB_ENV
-            echo "openlitespeed_https_port=8448" >> $GITHUB_ENV
-            echo "openlitespeed_admin_port=8449" >> $GITHUB_ENV
-            echo "caddy_http_port=8090" >> $GITHUB_ENV
-            echo "caddy_https_port=8450" >> $GITHUB_ENV
-            echo "node_http_port=8091" >> $GITHUB_ENV
-            echo "traefik_http_port=8092" >> $GITHUB_ENV
-            echo "traefik_https_port=8451" >> $GITHUB_ENV
+          echo "openresty_http_port=8080" >> $GITHUB_ENV
+          echo "openresty_https_port=8443" >> $GITHUB_ENV
+          echo "apache_http_port=8081" >> $GITHUB_ENV
+          echo "apache_https_port=8444" >> $GITHUB_ENV
+          echo "nginx_http_port=8082" >> $GITHUB_ENV
+          echo "nginx_https_port=8445" >> $GITHUB_ENV
+          echo "jetty_http_port=8083" >> $GITHUB_ENV
+          echo "jetty_https_port=8446" >> $GITHUB_ENV
+          echo "tomcat_http_port=8084" >> $GITHUB_ENV
+          echo "tomcat_https_port=8447" >> $GITHUB_ENV
+          echo "openlitespeed_http_port=8085" >> $GITHUB_ENV
+          echo "openlitespeed_https_port=8448" >> $GITHUB_ENV
+          echo "openlitespeed_admin_port=8449" >> $GITHUB_ENV
+          echo "caddy_http_port=8090" >> $GITHUB_ENV
+          echo "caddy_https_port=8450" >> $GITHUB_ENV
+          echo "node_http_port=8091" >> $GITHUB_ENV
+          echo "traefik_http_port=8092" >> $GITHUB_ENV
+          echo "traefik_https_port=8451" >> $GITHUB_ENV
 
       # Step 10: Start Testbed Servers (Docker Compose)
-      - name: Start Testbed (Docker Compose)
+      - name: Start Testbed Servers (Docker Compose)
         run: |
           cd http-conformance/testbed
-          docker-compose up -d
+          docker compose up -d
           echo "Docker Compose services started:"
-          docker-compose ps
-          docker exec testbed-jetty-1 bash -c "java -jar /usr/local/jetty/start.jar --add-modules=ssl,http2,https,test-keystore"
-          docker-compose restart jetty
+          docker compose ps
 
       # Step 11: Run HTTP Conformance Tests
+      - name: Enable HTTP/2 for Jetty and Restart
+        run: |
+          docker exec testbed-jetty-1 bash -c "java -jar /usr/local/jetty/start.jar --add-modules=ssl,http2,https,test-keystore"
+          docker compose restart jetty
+
       - name: Run HTTP Conformance Tests
         run: |
           cd http-conformance