split

OpenTOSCA · Jan 6, 2024 · c7a7406 · c7a7406
1 parent 54b0b53
commit c7a7406
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 23 deletions.
diff --git a/.github/actions/prepare-integration-test/action.yaml b/.github/actions/prepare-integration-test/action.yaml
@@ -1,15 +1,6 @@
 name: 'Prepare Integration Test Environment'
 inputs:
-    GCP_CREDENTIALS:
-        required: true
-
-    OS_SSH_KEY_FILE:
-        required: true
-
-    OS_APPLICATION_CREDENTIAL_ID:
-        required: true
-
-    OS_APPLICATION_CREDENTIAL_SECRET:
+    secrets:
         required: true
 
 runs:
@@ -42,7 +33,7 @@ runs:
 
               echo ${GCP_CREDENTIALS} | base64 --decode > /tmp/gcp-credentials.json
           env:
-              GCP_CREDENTIALS: ${{ inputs.GCP_CREDENTIALS }}
+              GCP_CREDENTIALS: ${{ secrets.GCP_CREDENTIALS }}
 
         - name: (PREPARE) Setup OS SSH key file
           shell: bash
@@ -55,7 +46,7 @@ runs:
               echo ${OS_SSH_KEY_FILE} | base64 --decode > /tmp/os-ssh-key-file
               chmod 400 /tmp/os-ssh-key-file
           env:
-              OS_SSH_KEY_FILE: ${{ inputs.OS_SSH_KEY_FILE }}
+              OS_SSH_KEY_FILE: ${{ secrets.OS_SSH_KEY_FILE }}
 
         - name: (PREPARE) Setup OS credentials
           shell: bash
@@ -83,8 +74,8 @@ runs:
 
               chmod 755 /tmp/os-credentials.sh
           env:
-              OS_APPLICATION_CREDENTIAL_ID: ${{ inputs.OS_APPLICATION_CREDENTIAL_ID }}
-              OS_APPLICATION_CREDENTIAL_SECRET: ${{ inputs.OS_APPLICATION_CREDENTIAL_SECRET }}
+              OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
+              OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
 
         - name: (PREPARE) Setup Python
           uses: actions/setup-python@v4

diff --git a/.github/workflows/night.yaml b/.github/workflows/night.yaml
@@ -12,8 +12,8 @@ on:
 
 concurrency: night
 jobs:
-    night:
-        name: Night
+    installation:
+        name: Installation
         runs-on: ubuntu-22.04
         steps:
             ###################################################
@@ -30,10 +30,7 @@ jobs:
             - name: (PREPARE) Prepare environment
               uses: ./.github/actions/prepare-integration-test
               with:
-                  GCP_CREDENTIALS: ${{ secrets.GCP_CREDENTIALS }}
-                  OS_SSH_KEY_FILE: ${{ secrets.OS_SSH_KEY_FILE }}
-                  OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
-                  OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
+                  secrets: ${{ secrets }}
 
             ###################################################
             #
@@ -57,9 +54,25 @@ jobs:
                   gpg --verify vintner-linux-x64.asc
                   rm vintner-linux-x64.asc
 
-            - name: Abort
-              run: exit 1
-              if: always()
+    xopera-motivation-dev:
+        name: xOpera Motivation Dev
+        runs-on: ubuntu-22.04
+        steps:
+            ###################################################
+            #
+            # Prepare
+            #
+            ###################################################
+
+            - name: (PREPARE) Checkout Repository
+              uses: actions/checkout@v3
+              with:
+                  lfs: true
+
+            - name: (PREPARE) Prepare environment
+              uses: ./.github/actions/prepare-integration-test
+              with:
+                  secrets: ${{ secrets }}
 
             ###################################################
             #
@@ -76,6 +89,10 @@ jobs:
                   vintner orchestrators enable --orchestrator unfurl
                   vintner orchestrators attest --orchestrator unfurl
 
+            - name: Abort
+              run: exit 1
+              if: always()
+
             - name: (UNFURL-MOTIVATION-PROD) Resolve variability
               run: |
                   vintner templates import --template motivation --path examples/unfurl-motivation