From 2d948a43732d4225ab21048fb835a2802e128438 Mon Sep 17 00:00:00 2001 From: Sean OMeara Date: Wed, 29 Mar 2023 08:21:50 +0200 Subject: [PATCH] jammy --- .drone.jsonnet | 3 +-- .drone.yml | 32 ++++++++++++++++---------------- ci/Dockerfile-build.el5 | 37 ------------------------------------- ci/Dockerfile-test.el5 | 4 ---- 4 files changed, 17 insertions(+), 59 deletions(-) delete mode 100644 ci/Dockerfile-build.el5 delete mode 100644 ci/Dockerfile-test.el5 diff --git a/.drone.jsonnet b/.drone.jsonnet index 819bb8caa..7b1644937 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -30,8 +30,7 @@ local targets = [ // { "os": "linux", distro: "redhat", "name": "el8", "isas": [ "amd64" ], "events": [ "push", "tag", "custom" ] }, // { "os": "linux", distro: "redhat", "name": "el7", "isas": [ "amd64" ], "events": [ "push", "tag", "custom" ] }, // { "os": "linux", distro: "redhat", "name": "el6", "isas": [ "amd64" ], "events": [ "push", "tag", "custom" ] }, - { "os": "linux", distro: "redhat", "name": "el5", "isas": [ "amd64" ], "events": [ "push", "tag", "custom" ] }, -// { "os": "linux", distro: "ubuntu", "name": "jammy", "isas": [ "amd64" ], "events": [ "push", "tag", "custom" ] }, + { "os": "linux", distro: "ubuntu", "name": "jammy", "isas": [ "amd64" ], "events": [ "push", "tag", "custom" ] }, // { "os": "linux", distro: "ubuntu", "name": "jessie", "isas": [ "amd64" ], "events": [ "push", "tag", "custom" ] }, // { "os": "windows", distro: "windows", "name": "windows", "isas": [ "amd64" ], "events": [ "push", "tag", "custom" ] }, // { "os": "darwin", distro: "darwin", "name": "darwin", "isas": [ "amd64" ], "events": [ "push", "tag", "custom" ] }, diff --git a/.drone.yml b/.drone.yml index ce7846d0d..e367bce19 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,27 +2,27 @@ clone: depth: 1 kind: pipeline -name: el5 amd64 build +name: jammy amd64 build platform: os: linux pull: always steps: - commands: - - ./ci/scripts/build.sh el5 redhat amd64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} + - ./ci/scripts/build.sh jammy ubuntu amd64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder name: build when: event: - push - commands: - - ./ci/scripts/build.sh el5 redhat amd64 ${DRONE_TAG} ${DRONE_BUILD_EVENT} + - ./ci/scripts/build.sh jammy ubuntu amd64 ${DRONE_TAG} ${DRONE_BUILD_EVENT} image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder name: release when: event: - tag - commands: - - ./ci/scripts/publish.sh el5 redhat amd64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} + - ./ci/scripts/publish.sh jammy ubuntu amd64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder name: copy build volumes: @@ -32,7 +32,7 @@ steps: event: - push - commands: - - ./ci/scripts/publish.sh el5 redhat amd64 ${DRONE_TAG} ${DRONE_BUILD_EVENT} + - ./ci/scripts/publish.sh jammy ubuntu amd64 ${DRONE_TAG} ${DRONE_BUILD_EVENT} image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder name: copy relase volumes: @@ -58,19 +58,19 @@ volumes: clone: depth: 1 depends_on: -- el5 amd64 build +- jammy amd64 build kind: pipeline -name: el5 index +name: jammy index platform: os: linux pull: always steps: - commands: - - /usr/local/bin/index zerotier-builds redhat el5 amd64 + - /usr/local/bin/index zerotier-builds ubuntu jammy amd64 environment: GPG_PRIVATE_KEY: from_secret: gpg-private-key - image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/dnf-builder + image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/apt-builder name: index build volumes: - name: zerotier-builds @@ -79,11 +79,11 @@ steps: event: - push - commands: - - /usr/local/bin/index zerotier-releases redhat el5 amd64 + - /usr/local/bin/index zerotier-releases ubuntu jammy amd64 environment: GPG_PRIVATE_KEY: from_secret: gpg-private-key - image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/dnf-builder + image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/apt-builder name: index release volumes: - name: zerotier-releases @@ -108,15 +108,15 @@ volumes: clone: depth: 1 depends_on: -- el5 index +- jammy index kind: pipeline -name: el5 amd64 test +name: jammy amd64 test platform: os: linux pull: always steps: - commands: - - ./ci/scripts/test.sh el5 redhat amd64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} + - ./ci/scripts/test.sh jammy ubuntu amd64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder name: test build volumes: @@ -126,7 +126,7 @@ steps: event: - push - commands: - - ./ci/scripts/test.sh el5 redhat amd64 ${DRONE_TAG} ${DRONE_BUILD_EVENT} + - ./ci/scripts/test.sh jammy ubuntu amd64 ${DRONE_TAG} ${DRONE_BUILD_EVENT} image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder name: test release volumes: @@ -150,6 +150,6 @@ volumes: name: zerotier-releases --- kind: signature -hmac: ae0cda8013ad7f0832be07ef67b5742e7c0e07f0df26c9995eb95f9b993181b7 +hmac: 2720f6d3e0e35871051e5622f834f5276531f19dae6318f6be64ecb61f2164da ... diff --git a/ci/Dockerfile-build.el5 b/ci/Dockerfile-build.el5 deleted file mode 100644 index 75dc67048..000000000 --- a/ci/Dockerfile-build.el5 +++ /dev/null @@ -1,37 +0,0 @@ -ARG DOCKER_ARCH -FROM --platform=linux/${DOCKER_ARCH} alpine:edge AS builder - -RUN apk update -RUN apk add curl -RUN apk add bash -RUN apk add file -RUN apk add rust -RUN apk add cargo -RUN apk add make -RUN apk add cmake -RUN apk add clang -RUN apk add openssl-dev -RUN apk add linux-headers -RUN apk add build-base -RUN apk add openssl-libs-static - -COPY . . -RUN ZT_STATIC=1 make -RUN ls -la - -ARG DOCKER_ARCH -FROM --platform=linux/${DOCKER_ARCH} centos:5 AS stage -WORKDIR /root/rpmbuild/BUILD -COPY . . -COPY --from=builder zerotier-* ./ -RUN rm -f /etc/yum.repos.d/* -RUN printf "[C5.10-base]\nname=CentOS-5.10 - Base\nbaseurl=http://vault.epel.cloud/5.10/os/\$basearch/\ngpgcheck=1\ngpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5\nenabled=1\nmetadata_expire=never\n" > /etc/yum.repos.d/CentOS-Base.repo -RUN uname -a -RUN yum -y install make gcc rpm-build -RUN pwd -RUN ls -la -RUN make redhat - -FROM scratch AS export -ARG ZT_NAME -COPY --from=stage /root/rpmbuild/RPMS/*/*.rpm ./${ZT_NAME}/ diff --git a/ci/Dockerfile-test.el5 b/ci/Dockerfile-test.el5 deleted file mode 100644 index c16db0dae..000000000 --- a/ci/Dockerfile-test.el5 +++ /dev/null @@ -1,4 +0,0 @@ -ARG DOCKER_ARCH -FROM --platform=linux/${DOCKER_ARCH} centos:5 -RUN printf "[C5.10-base]\nname=CentOS-5.10 - Base\nbaseurl=http://vault.epel.cloud/5.10/os/\$basearch/\ngpgcheck=1\ngpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5\nenabled=1\nmetadata_expire=never\n" > /etc/yum.repos.d/CentOS-Base.repo -RUN yum -y install curl