Fix CI web cert place in file

ORNL · Feb 21, 2024 · c8c92bd · c8c92bd
1 parent b19ed7f
commit c8c92bd
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 24 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -419,30 +419,7 @@ end-to-end-ws-setup:
     - echo "$BRANCH_LOWER"
     - mkdir -p "$HOST_LOG_FILE_PATH"
     - mkdir -p "${DATAFED_WEB_KEY_DIR}"
-    - >
-      if [ ! -e "$DATAFED_WEB_CERT_PATH" ] || [ ! -e "$DATAFED_WEB_KEY_PATH" ]
-      then
-        if [ -e "$DATAFED_WEB_CERT_PATH" ]
-        then
-          rm "${DATAFED_WEB_CERT_PATH}"
-        fi
-        if [ -e "$DATAFED_WEB_KEY_PATH" ]
-        then
-          rm "${DATAFED_WEB_KEY_PATH}"
-        fi
-        if [ -e "$DATAFED_WEB_CSR_PATH" ]
-        then
-          rm "${DATAFED_WEB_CSR_PATH}"
-        fi
-        openssl genrsa -out "$DATAFED_WEB_KEY_PATH" 2048
-        openssl req -new -key "$DATAFED_WEB_KEY_PATH" \
-          -out "${DATAFED_WEB_CSR_PATH}" \
-          -subj "/C=US/ST=TN/L=Oak Ridge/O=ORNL/OU=DLT/CN=${DI_DATAFED_DOMAIN}"
-        openssl x509 -req -days 3650 \
-           -in "${DATAFED_WEB_CSR_PATH}" \
-           -signkey "$DATAFED_WEB_KEY_PATH" \
-           -out "$DATAFED_WEB_CERT_PATH"
-      fi
+    - ./scripts/ci_setup_web_certs.sh
     - chmod o+w "${HOST_LOG_FILE_PATH}"
     - chown gitlab-runner "$HOST_LOG_FILE_PATH"
     - ./scripts/generate_datafed.sh

diff --git a/scripts/ci_setup_web_certs.sh b/scripts/ci_setup_web_certs.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+if [ ! -e "$DATAFED_WEB_CERT_PATH" ] || [ ! -e "$DATAFED_WEB_KEY_PATH" ]
+then
+  if [ -e "$DATAFED_WEB_CERT_PATH" ]
+  then
+    rm "${DATAFED_WEB_CERT_PATH}"
+  fi
+  if [ -e "$DATAFED_WEB_KEY_PATH" ]
+  then
+    rm "${DATAFED_WEB_KEY_PATH}"
+  fi
+  if [ -e "$DATAFED_WEB_CSR_PATH" ]
+  then
+    rm "${DATAFED_WEB_CSR_PATH}"
+  fi
+  openssl genrsa -out "$DATAFED_WEB_KEY_PATH" 2048
+  openssl req -new -key "$DATAFED_WEB_KEY_PATH" \
+    -out "${DATAFED_WEB_CSR_PATH}" \
+    -subj "/C=US/ST=TN/L=Oak Ridge/O=ORNL/OU=DLT/CN=${DI_DATAFED_DOMAIN}"
+  openssl x509 -req -days 3650 \
+     -in "${DATAFED_WEB_CSR_PATH}" \
+     -signkey "$DATAFED_WEB_KEY_PATH" \
+     -out "$DATAFED_WEB_CERT_PATH"
+fi
+