cache unfurl in workflow

OpenTOSCA · Nov 13, 2023 · 3f90b22 · 3f90b22
1 parent e22af5f
commit 3f90b22
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/.github/workflows/night.yaml b/.github/workflows/night.yaml
@@ -55,21 +55,23 @@ jobs:
                   python-version: 3.10.13
                   cache: pip
 
-            - name: (PREPARE) Install xOpera
-              run: sudo ./src/assets/scripts/install-xopera.sh
-
             - name: (PREPARE) Cache Unfurl
               uses: actions/cache@v3
               with:
-                  path: /home/runner/.unfurl_home
-                  key: unfurl-home
+                  path: /home/runner/.opera
+                  key: xopera
+
+            - name: (PREPARE) Install xOpera
+              run: |
+                  mkdir /home/runner/.opera
+                  cd /home/runner/.opera
+                  python3 -m venv .venv && . .venv/bin/activate
+                  pip install --upgrade pip
+                  pip install openstacksdk==0.61 pyyaml==5.3.1 opera==0.6.9
 
             # TODO: ./src/assets/scripts/install-unfurl.sh installs unfurl for root and not for "runner"
             - name: (PREPARE) Install Unfurl
-              run: pip install unfurl==0.7.1
-
-            - name: (PREPARE) Set up Unfurl
-              run: yes | unfurl home --init
+              run: pip install unfurl==0.9.1
 
             ###################################################
             #
@@ -126,8 +128,9 @@ jobs:
                   vintner setup clean --force
                   vintner setup init
 
-                  vintner orchestrators init xopera --no-venv
+                  vintner orchestrators init xopera --dir /home/runner/.opera
                   vintner orchestrators enable --orchestrator xopera
+                  vintner orchestrators attest --orchestrator xopera
 
                   vintner templates import --template motivation --path examples/xopera-motivation
                   vintner instances init --instance motivation --template motivation
@@ -156,8 +159,9 @@ jobs:
                   vintner setup clean --force
                   vintner setup init
 
-                  vintner orchestrators init xopera --no-venv
+                  vintner orchestrators init xopera --dir /home/runner/.opera
                   vintner orchestrators enable --orchestrator xopera
+                  vintner orchestrators attest --orchestrator xopera
 
                   vintner templates import --template pruning --path examples/xopera-pruning
                   vintner instances init --instance pruning --template pruning
@@ -187,6 +191,7 @@ jobs:
 
                   vintner orchestrators init unfurl --no-venv
                   vintner orchestrators enable --orchestrator unfurl
+                  vintner orchestrators attest --orchestrator unfurl
 
                   vintner templates import --template artifacts --path examples/unfurl-artifacts
                   vintner instances init --instance artifacts --template artifacts

diff --git a/docs/docs/orchestrators.md b/docs/docs/orchestrators.md
@@ -51,7 +51,7 @@ vintner orchestrators attest --orchestrator xopera-wsl
 ## Unfurl
 
 You can install Unfurl using the following command.
-This will install Unfurl v0.7.1 system-wide using pip.
+This will install Unfurl v0.9.1 system-wide using pip.
 For a manual installation see [the documentation](https://docs.unfurl.run/README.html#installation){target=_blank}.
 
 ```shell linenums="1"
@@ -105,4 +105,4 @@ The orchestrators provide more features than we integrated, thus, checkout [TOSS
   [#257](https://github.com/xlab-si/xopera-opera/issues/257){target=_blank},
   [#258](https://github.com/xlab-si/xopera-opera/issues/258){target=_blank}, and
   [#261](https://github.com/xlab-si/xopera-opera/issues/261){target=_blank}.
-- xOpera deletes attribute assignments during updates, see [issue #262](https://github.com/xlab-si/xopera-opera/issues/262){target=_blank}.
+- xOpera deletes attribute assignments during updates, see [issue #262](https://github.com/xlab-si/xopera-opera/issues/262){target=_blank}.
diff --git a/src/assets/scripts/install-unfurl.sh b/src/assets/scripts/install-unfurl.sh
@@ -11,5 +11,4 @@ if which unfurl &>/dev/null; then
     exit 0
 fi
 
-pip install unfurl==0.7.1
-yes | unfurl home --init
+pip install unfurl==0.9.1