From eafb569599cb0b2a3778ba7cefced74f012548c2 Mon Sep 17 00:00:00 2001 From: duartecoelhomovai Date: Thu, 19 Oct 2023 10:30:54 +0100 Subject: [PATCH 1/4] feature/proxy-archives --- docker/noetic/Dockerfile | 2 +- files/apt/movai-ros-proxy.list | 4 ++++ files/apt/movai-ubuntu-archive-proxy.list | 4 +++- files/apt/movai-ubuntu-ports-proxy.list | 2 ++ 4 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 files/apt/movai-ros-proxy.list diff --git a/docker/noetic/Dockerfile b/docker/noetic/Dockerfile index b856820..c2c2c1d 100644 --- a/docker/noetic/Dockerfile +++ b/docker/noetic/Dockerfile @@ -48,12 +48,12 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio COPY files/apt/movai-ubuntu-archive-proxy.list /etc/apt/sources.list.d/movai-ubuntu-archive-proxy.list COPY files/apt/movai-ubuntu-ports-proxy.list /etc/apt/sources.list.d/movai-ubuntu-ports-proxy.list COPY files/apt/movai-ubuntu-security-proxy.list /etc/apt/sources.list.d/movai-ubuntu-security-proxy.list +COPY files/apt/movai-ros-proxy.list /etc/apt/sources.list.d/movai-ros-proxy.list SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN find /etc/apt/sources.list.d/ -type f -name 'ros*.list' -exec rm {} \; &&\ echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections &&\ curl -fsSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key | gpg --dearmor -o /usr/share/keyrings/ros.key &&\ - echo "deb [signed-by=/usr/share/keyrings/ros.key] https://artifacts.aws.cloud.mov.ai/repository/ppa-proxy-ros focal main" | tee /etc/apt/sources.list.d/movai-ros.list > /dev/null &&\ mv /etc/apt/sources.list /etc/apt/sources.list.bck &&\ touch /etc/apt/sources.list &&\ curl -fsSL $APT_REPOSITORY/movai-applications/gpg | apt-key add - &&\ diff --git a/files/apt/movai-ros-proxy.list b/files/apt/movai-ros-proxy.list new file mode 100644 index 0000000..cbdab41 --- /dev/null +++ b/files/apt/movai-ros-proxy.list @@ -0,0 +1,4 @@ +# Add ROS proxy +deb [signed-by=/usr/share/keyrings/ros.key] https://artifacts.aws.cloud.mov.ai/repository/ppa-proxy-ros focal main +#Add ROS proxy backup +deb [arch=amd64] https://artifacts.aws.cloud.mov.ai/repository/ppa-proxy-ros-backup ros-backup main diff --git a/files/apt/movai-ubuntu-archive-proxy.list b/files/apt/movai-ubuntu-archive-proxy.list index 5de7207..f127466 100644 --- a/files/apt/movai-ubuntu-archive-proxy.list +++ b/files/apt/movai-ubuntu-archive-proxy.list @@ -11,4 +11,6 @@ deb [arch=amd64] https://artifacts.aws.cloud.mov.ai/repository/ppa-archive-focal # Add focal-backports proxy deb [arch=amd64] https://artifacts.aws.cloud.mov.ai/repository/ppa-archive-focal-backports focal-backports universe deb [arch=amd64] https://artifacts.aws.cloud.mov.ai/repository/ppa-archive-focal-backports focal-backports multiverse -deb [arch=amd64] https://artifacts.aws.cloud.mov.ai/repository/ppa-archive-focal-backports focal-backports main \ No newline at end of file +deb [arch=amd64] https://artifacts.aws.cloud.mov.ai/repository/ppa-archive-focal-backports focal-backports main +# Add backup of focal-archive +deb [arch=amd64] https://artifacts.aws.cloud.mov.ai/repository/ppa-archive-focal-backup focal-backup main diff --git a/files/apt/movai-ubuntu-ports-proxy.list b/files/apt/movai-ubuntu-ports-proxy.list index f006fd3..578130b 100644 --- a/files/apt/movai-ubuntu-ports-proxy.list +++ b/files/apt/movai-ubuntu-ports-proxy.list @@ -16,3 +16,5 @@ deb [arch=arm64,armhf] https://artifacts.aws.cloud.mov.ai/repository/ppa-ports-f deb [arch=arm64,armhf] https://artifacts.aws.cloud.mov.ai/repository/ppa-ports-focal-security focal-security multiverse deb [arch=arm64,armhf] https://artifacts.aws.cloud.mov.ai/repository/ppa-ports-focal-security focal-security universe deb [arch=arm64,armhf] https://artifacts.aws.cloud.mov.ai/repository/ppa-ports-focal-security focal-security restricted +# Add backup of focal-ports +deb [arch=amd64] https://artifacts.aws.cloud.mov.ai/repository/ppa-ports-focal-backup portsfocal-backup main \ No newline at end of file From 386ffacd9e23176a818e490e45deaae217d494c0 Mon Sep 17 00:00:00 2001 From: duartecoelhomovai Date: Wed, 3 Apr 2024 16:24:46 +0100 Subject: [PATCH 2/4] comment out backup ppa until task DP-1484 --- files/apt/movai-ubuntu-archive-proxy.list | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/apt/movai-ubuntu-archive-proxy.list b/files/apt/movai-ubuntu-archive-proxy.list index f127466..e87c04b 100644 --- a/files/apt/movai-ubuntu-archive-proxy.list +++ b/files/apt/movai-ubuntu-archive-proxy.list @@ -13,4 +13,4 @@ deb [arch=amd64] https://artifacts.aws.cloud.mov.ai/repository/ppa-archive-focal deb [arch=amd64] https://artifacts.aws.cloud.mov.ai/repository/ppa-archive-focal-backports focal-backports multiverse deb [arch=amd64] https://artifacts.aws.cloud.mov.ai/repository/ppa-archive-focal-backports focal-backports main # Add backup of focal-archive -deb [arch=amd64] https://artifacts.aws.cloud.mov.ai/repository/ppa-archive-focal-backup focal-backup main +#deb [arch=amd64] https://artifacts.aws.cloud.mov.ai/repository/ppa-archive-focal-backup focal-backup main From ff0e3b348ebd33d583109649c01adb9b97782ab5 Mon Sep 17 00:00:00 2001 From: duartecoelhomovai Date: Wed, 3 Apr 2024 16:29:44 +0100 Subject: [PATCH 3/4] remove bionic --- .github/workflows/docker-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml index 65c1983..56c859b 100644 --- a/.github/workflows/docker-ci.yml +++ b/.github/workflows/docker-ci.yml @@ -37,7 +37,6 @@ jobs: github_registry_user: ${{ secrets.RAISE_BOT_COMMIT_USER }} github_registry_password: ${{ secrets.RAISE_BOT_COMMIT_PASSWORD }} snyk_token: ${{ secrets.SNYK_TOKEN }} - movai-base-bionic: uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@v2 with: docker_file: docker/melodic/Dockerfile-rosfree From c0afdcc00cd4be954cbf875366a191a93049a9bc Mon Sep 17 00:00:00 2001 From: duartecoelhomovai Date: Wed, 3 Apr 2024 18:13:52 +0100 Subject: [PATCH 4/4] fix pipelines --- .github/workflows/autoupdate.yml | 15 --------------- .github/workflows/docker-ci.yml | 19 ------------------- 2 files changed, 34 deletions(-) delete mode 100644 .github/workflows/autoupdate.yml diff --git a/.github/workflows/autoupdate.yml b/.github/workflows/autoupdate.yml deleted file mode 100644 index 71bf9b1..0000000 --- a/.github/workflows/autoupdate.yml +++ /dev/null @@ -1,15 +0,0 @@ -# autoupdate is a GitHub Action that auto-updates pull requests branches whenever changes land on their destination branch. -name: autoupdate -on: - push: - branches: - - main - - dev -jobs: - autoupdate: - name: autoupdate - runs-on: ubuntu-20.04 - steps: - - uses: docker://chinthakagodawita/autoupdate-action:v1 - env: - GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}' diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml index 56c859b..18f4b6d 100644 --- a/.github/workflows/docker-ci.yml +++ b/.github/workflows/docker-ci.yml @@ -37,25 +37,6 @@ jobs: github_registry_user: ${{ secrets.RAISE_BOT_COMMIT_USER }} github_registry_password: ${{ secrets.RAISE_BOT_COMMIT_PASSWORD }} snyk_token: ${{ secrets.SNYK_TOKEN }} - uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@v2 - with: - docker_file: docker/melodic/Dockerfile-rosfree - docker_image: devops/movai-base-bionic - public: true - public_image: ce/movai-base-bionic - deploy: ${{ contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/tags/v')}} - version: ${GITHUB_REF##*/} - push_latest: ${{ contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/tags/v') }} - snyk_check: true - platforms: linux/amd64, linux/arm/v7, linux/arm64 - secrets: - registry_user: ${{ secrets.PORTUS_APP_USER }} - registry_password: ${{ secrets.PORTUS_APP_TOKEN }} - pub_registry_user: ${{ secrets.PORTUS_APP_USER }} - pub_registry_password: ${{ secrets.PORTUS_APP_TOKEN }} - github_registry_user: ${{ secrets.RAISE_BOT_COMMIT_USER }} - github_registry_password: ${{ secrets.RAISE_BOT_COMMIT_PASSWORD }} - snyk_token: ${{ secrets.SNYK_TOKEN }} movai-base-focal: uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@v2 with: