Message ID | 20250911152218.1834842-1-barnabas.pocze@ideasonboard.com |
---|---|
State | Accepted |
Headers | show |
Series |
|
Related | show |
On Thu, Sep 11, 2025 at 05:22:18PM +0200, Barnabás Pőcze wrote: > This reverts commit f4e5048043af679ed7deb3fe3a0ff124a2033932. > > The `test-soraka` job has not been working for a couple months now, > so decommission it as has been decided. The chrome os build is kept. > > Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > .gitlab-ci/lava/soraka-camera-test.yml | 88 -------------------------- > README.rst | 3 +- > gitlab-ci.yml | 22 ------- > 3 files changed, 1 insertion(+), 112 deletions(-) > delete mode 100644 .gitlab-ci/lava/soraka-camera-test.yml > > diff --git a/.gitlab-ci/lava/soraka-camera-test.yml b/.gitlab-ci/lava/soraka-camera-test.yml > deleted file mode 100644 > index a08af19..0000000 > --- a/.gitlab-ci/lava/soraka-camera-test.yml > +++ /dev/null > @@ -1,88 +0,0 @@ > -device_type: soraka > -job_name: Soraka camera test > - > -timeouts: > - job: > - minutes: 120 > - action: > - minutes: 5 > - connection: > - minutes: 2 > -priority: medium > -visibility: public > - > -actions: > - > -- boot: > - timeout: > - minutes: 2 > - namespace: deploy_ns > - method: minimal > - prompts: > - - 'Committing NVMEM changes.]' > - - '(.*) Committing NVMEM changes(.*)' > - - '\.* Committing NVMEM changes \.*' > - > -- boot: > - namespace: ssh_ns > - method: new_connection > - connection: ssh > - prompts: ["lava@"] > - > -- test: > - timeout: > - minutes: 60 > - > - namespace: deploy_ns > - connection-namespace: ssh_ns > - > - interactive: > - - name: unlock > - prompts: ["lava@"] > - script: > - - name: unlock-device > - command: /home/lava/lava-tools/unlock_device.sh > - - name: wait-for-prompt > - command: > - > -- test: > - timeout: > - minutes: 60 > - > - namespace: deploy_ns > - connection-namespace: ssh_ns > - > - interactive: > - - name: update > - prompts: ["lava@"] > - script: > - - name: update-libcamera > - command: /home/lava/lava-tools/update_libcamera.sh {{ job.LIBCAMERA_ARTIFACT_URL }} > - > -- test: > - timeout: > - minutes: 60 > - > - namespace: deploy_ns > - connection-namespace: ssh_ns > - > - interactive: > - - name: cts > - prompts: ["lava@"] > - script: > - - name: run-cts > - command: /home/lava/lava-tools/run-cros-camera-test.sh > - > -- test: > - timeout: > - minutes: 60 > - > - namespace: deploy_ns > - connection-namespace: ssh_ns > - > - interactive: > - - name: cts > - prompts: ["lava@"] > - script: > - - name: run-cts > - command: /home/lava/lava-tools/run-cts.sh > diff --git a/README.rst b/README.rst > index 522859d..e000fa6 100644 > --- a/README.rst > +++ b/README.rst > @@ -44,5 +44,4 @@ access to runners, you can enable CI for your project in the web UI's *Settings > configuration file* to ``gitlab-ci.yml@camera/libcamera-ci``. > > All the CI jobs that run on shared runners with GitLab-build container images > -will be available. This excludes the ``build-package:cros`` and ``test-soraka`` > -jobs. > +will be available. > diff --git a/gitlab-ci.yml b/gitlab-ci.yml > index da6766b..590d871 100644 > --- a/gitlab-ci.yml > +++ b/gitlab-ci.yml > @@ -312,14 +312,10 @@ build-package:cros: > needs: [] > script: > - $CI_PROJECT_DIR/.gitlab-ci/build-libcamera-cros.sh > - - echo "LIBCAMERA_ARTIFACT_URL=${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/jobs/${CI_JOB_ID}/artifacts/libcamera-upstream-9999.tbz2" >> env > artifacts: > name: libcamera-cros-${CI_COMMIT_SHA} > paths: > - libcamera-upstream-9999.tbz2 > - - .gitlab-ci/lava/soraka-camera-test.yml > - reports: > - dotenv: env > > # ------------------------------------------------------------------------------ > # Lint stage - Run checkstyle.py and check merge suitability > @@ -362,24 +358,6 @@ merge-check: > # Test stage - Run unit tests and hardware tests > # ------------------------------------------------------------------------------ > > -test-soraka: > - stage: test > - needs: > - - job: build-package:cros > - rules: > - - changes: > - paths: > - - include/android/**/* > - - src/android/**/* > - - src/ipa/ipu3/**/* > - - src/libcamera/pipeline/ipu3/**/* > - compare_to: refs/heads/master > - when: on_success > - tags: > - - libcamera-lava > - script: > - - submit .gitlab-ci/lava/soraka-camera-test.yml > - > # Run the unit tests in a virtual machine. Enable only the options exercised by > # the unit tests. > test-unit:
Quoting Barnabás Pőcze (2025-09-11 17:22:18) > This reverts commit f4e5048043af679ed7deb3fe3a0ff124a2033932. > > The `test-soraka` job has not been working for a couple months now, > so decommission it as has been decided. The chrome os build is kept. > > Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com> I read it, so I can as well put a Reviewed-by: Stefan Klug <stefan.klug@ideasonboard.com> there :-) Cheers, Stefan > --- > .gitlab-ci/lava/soraka-camera-test.yml | 88 -------------------------- > README.rst | 3 +- > gitlab-ci.yml | 22 ------- > 3 files changed, 1 insertion(+), 112 deletions(-) > delete mode 100644 .gitlab-ci/lava/soraka-camera-test.yml > > diff --git a/.gitlab-ci/lava/soraka-camera-test.yml b/.gitlab-ci/lava/soraka-camera-test.yml > deleted file mode 100644 > index a08af19..0000000 > --- a/.gitlab-ci/lava/soraka-camera-test.yml > +++ /dev/null > @@ -1,88 +0,0 @@ > -device_type: soraka > -job_name: Soraka camera test > - > -timeouts: > - job: > - minutes: 120 > - action: > - minutes: 5 > - connection: > - minutes: 2 > -priority: medium > -visibility: public > - > -actions: > - > -- boot: > - timeout: > - minutes: 2 > - namespace: deploy_ns > - method: minimal > - prompts: > - - 'Committing NVMEM changes.]' > - - '(.*) Committing NVMEM changes(.*)' > - - '\.* Committing NVMEM changes \.*' > - > -- boot: > - namespace: ssh_ns > - method: new_connection > - connection: ssh > - prompts: ["lava@"] > - > -- test: > - timeout: > - minutes: 60 > - > - namespace: deploy_ns > - connection-namespace: ssh_ns > - > - interactive: > - - name: unlock > - prompts: ["lava@"] > - script: > - - name: unlock-device > - command: /home/lava/lava-tools/unlock_device.sh > - - name: wait-for-prompt > - command: > - > -- test: > - timeout: > - minutes: 60 > - > - namespace: deploy_ns > - connection-namespace: ssh_ns > - > - interactive: > - - name: update > - prompts: ["lava@"] > - script: > - - name: update-libcamera > - command: /home/lava/lava-tools/update_libcamera.sh {{ job.LIBCAMERA_ARTIFACT_URL }} > - > -- test: > - timeout: > - minutes: 60 > - > - namespace: deploy_ns > - connection-namespace: ssh_ns > - > - interactive: > - - name: cts > - prompts: ["lava@"] > - script: > - - name: run-cts > - command: /home/lava/lava-tools/run-cros-camera-test.sh > - > -- test: > - timeout: > - minutes: 60 > - > - namespace: deploy_ns > - connection-namespace: ssh_ns > - > - interactive: > - - name: cts > - prompts: ["lava@"] > - script: > - - name: run-cts > - command: /home/lava/lava-tools/run-cts.sh > diff --git a/README.rst b/README.rst > index 522859d..e000fa6 100644 > --- a/README.rst > +++ b/README.rst > @@ -44,5 +44,4 @@ access to runners, you can enable CI for your project in the web UI's *Settings > configuration file* to ``gitlab-ci.yml@camera/libcamera-ci``. > > All the CI jobs that run on shared runners with GitLab-build container images > -will be available. This excludes the ``build-package:cros`` and ``test-soraka`` > -jobs. > +will be available. > diff --git a/gitlab-ci.yml b/gitlab-ci.yml > index da6766b..590d871 100644 > --- a/gitlab-ci.yml > +++ b/gitlab-ci.yml > @@ -312,14 +312,10 @@ build-package:cros: > needs: [] > script: > - $CI_PROJECT_DIR/.gitlab-ci/build-libcamera-cros.sh > - - echo "LIBCAMERA_ARTIFACT_URL=${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/jobs/${CI_JOB_ID}/artifacts/libcamera-upstream-9999.tbz2" >> env > artifacts: > name: libcamera-cros-${CI_COMMIT_SHA} > paths: > - libcamera-upstream-9999.tbz2 > - - .gitlab-ci/lava/soraka-camera-test.yml > - reports: > - dotenv: env > > # ------------------------------------------------------------------------------ > # Lint stage - Run checkstyle.py and check merge suitability > @@ -362,24 +358,6 @@ merge-check: > # Test stage - Run unit tests and hardware tests > # ------------------------------------------------------------------------------ > > -test-soraka: > - stage: test > - needs: > - - job: build-package:cros > - rules: > - - changes: > - paths: > - - include/android/**/* > - - src/android/**/* > - - src/ipa/ipu3/**/* > - - src/libcamera/pipeline/ipu3/**/* > - compare_to: refs/heads/master > - when: on_success > - tags: > - - libcamera-lava > - script: > - - submit .gitlab-ci/lava/soraka-camera-test.yml > - > # Run the unit tests in a virtual machine. Enable only the options exercised by > # the unit tests. > test-unit: > -- > 2.51.0
diff --git a/.gitlab-ci/lava/soraka-camera-test.yml b/.gitlab-ci/lava/soraka-camera-test.yml deleted file mode 100644 index a08af19..0000000 --- a/.gitlab-ci/lava/soraka-camera-test.yml +++ /dev/null @@ -1,88 +0,0 @@ -device_type: soraka -job_name: Soraka camera test - -timeouts: - job: - minutes: 120 - action: - minutes: 5 - connection: - minutes: 2 -priority: medium -visibility: public - -actions: - -- boot: - timeout: - minutes: 2 - namespace: deploy_ns - method: minimal - prompts: - - 'Committing NVMEM changes.]' - - '(.*) Committing NVMEM changes(.*)' - - '\.* Committing NVMEM changes \.*' - -- boot: - namespace: ssh_ns - method: new_connection - connection: ssh - prompts: ["lava@"] - -- test: - timeout: - minutes: 60 - - namespace: deploy_ns - connection-namespace: ssh_ns - - interactive: - - name: unlock - prompts: ["lava@"] - script: - - name: unlock-device - command: /home/lava/lava-tools/unlock_device.sh - - name: wait-for-prompt - command: - -- test: - timeout: - minutes: 60 - - namespace: deploy_ns - connection-namespace: ssh_ns - - interactive: - - name: update - prompts: ["lava@"] - script: - - name: update-libcamera - command: /home/lava/lava-tools/update_libcamera.sh {{ job.LIBCAMERA_ARTIFACT_URL }} - -- test: - timeout: - minutes: 60 - - namespace: deploy_ns - connection-namespace: ssh_ns - - interactive: - - name: cts - prompts: ["lava@"] - script: - - name: run-cts - command: /home/lava/lava-tools/run-cros-camera-test.sh - -- test: - timeout: - minutes: 60 - - namespace: deploy_ns - connection-namespace: ssh_ns - - interactive: - - name: cts - prompts: ["lava@"] - script: - - name: run-cts - command: /home/lava/lava-tools/run-cts.sh diff --git a/README.rst b/README.rst index 522859d..e000fa6 100644 --- a/README.rst +++ b/README.rst @@ -44,5 +44,4 @@ access to runners, you can enable CI for your project in the web UI's *Settings configuration file* to ``gitlab-ci.yml@camera/libcamera-ci``. All the CI jobs that run on shared runners with GitLab-build container images -will be available. This excludes the ``build-package:cros`` and ``test-soraka`` -jobs. +will be available. diff --git a/gitlab-ci.yml b/gitlab-ci.yml index da6766b..590d871 100644 --- a/gitlab-ci.yml +++ b/gitlab-ci.yml @@ -312,14 +312,10 @@ build-package:cros: needs: [] script: - $CI_PROJECT_DIR/.gitlab-ci/build-libcamera-cros.sh - - echo "LIBCAMERA_ARTIFACT_URL=${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/jobs/${CI_JOB_ID}/artifacts/libcamera-upstream-9999.tbz2" >> env artifacts: name: libcamera-cros-${CI_COMMIT_SHA} paths: - libcamera-upstream-9999.tbz2 - - .gitlab-ci/lava/soraka-camera-test.yml - reports: - dotenv: env # ------------------------------------------------------------------------------ # Lint stage - Run checkstyle.py and check merge suitability @@ -362,24 +358,6 @@ merge-check: # Test stage - Run unit tests and hardware tests # ------------------------------------------------------------------------------ -test-soraka: - stage: test - needs: - - job: build-package:cros - rules: - - changes: - paths: - - include/android/**/* - - src/android/**/* - - src/ipa/ipu3/**/* - - src/libcamera/pipeline/ipu3/**/* - compare_to: refs/heads/master - when: on_success - tags: - - libcamera-lava - script: - - submit .gitlab-ci/lava/soraka-camera-test.yml - # Run the unit tests in a virtual machine. Enable only the options exercised by # the unit tests. test-unit:
This reverts commit f4e5048043af679ed7deb3fe3a0ff124a2033932. The `test-soraka` job has not been working for a couple months now, so decommission it as has been decided. The chrome os build is kept. Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com> --- .gitlab-ci/lava/soraka-camera-test.yml | 88 -------------------------- README.rst | 3 +- gitlab-ci.yml | 22 ------- 3 files changed, 1 insertion(+), 112 deletions(-) delete mode 100644 .gitlab-ci/lava/soraka-camera-test.yml -- 2.51.0