From 687d9cf7955be2bef0ccbc9adb0066cda5a6ec40 Mon Sep 17 00:00:00 2001 From: zandrewitte Date: Tue, 7 Dec 2021 10:25:35 +0200 Subject: [PATCH 01/81] WIP publish images --- .cd-builders/runner7-circle-deb/Makefile | 3 ++ .gitlab-ci-build-runners.yml | 37 ++++++++++++++++++++++++ .gitlab-ci.yml | 10 +++++++ 3 files changed, 50 insertions(+) create mode 100644 .gitlab-ci-build-runners.yml diff --git a/.cd-builders/runner7-circle-deb/Makefile b/.cd-builders/runner7-circle-deb/Makefile index a2e85fae9f0ee9..5bd770099b2d11 100644 --- a/.cd-builders/runner7-circle-deb/Makefile +++ b/.cd-builders/runner7-circle-deb/Makefile @@ -1,5 +1,8 @@ RUNTIMETAG := $(shell date +%Y%m%d) +version: + echo $(RUNTIMETAG) | tail -1 > version.txt + build: docker build -t docker.io/stackstate/stackstate-agent-runner-circle:deb7_$(RUNTIMETAG) . push: diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml new file mode 100644 index 00000000000000..43ec52226ac815 --- /dev/null +++ b/.gitlab-ci-build-runners.yml @@ -0,0 +1,37 @@ + + +stages: + - build_runner_base + - build_runners + +variables: + RUNNER7_DEB_BASE: $CI_PROJECT_DIR/.cd-builders/runner7-circle-deb + + +# produces the base deb image: quay.io/stackstate/stackstate-agent-runner-circle:deb7_{yyyymmdd} +build-v3-deb-base: + # use ubuntu as the image builder + image: ubuntu:20.04 + stage: build_runner_base + interruptible: true + script: + - cd $RUNNER7_DEB_BASE + # make the image, try running sh, push the tag to quay, write the version as a artifact + - make build try push version + artifacts: + name: Base deb image version + paths: + - $RUNNER7_DEB_BASE/version.txt + retry: + max: 2 + when: + - runner_system_failure + - stuck_or_timeout_failure + +# image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:latest7 + +# image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7_20211004_v7_0 + +# image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos6_20190429 + +# image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4662395abb5ac6..f814226d749329 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -142,3 +142,13 @@ cluster_agent: rules: - <<: *include_on_cluster_agent - when: never + +build_runners: + stage: triggers + variables: + <<: *commonvariables + trigger: + include: .gitlab-ci-build-runners.yml + strategy: depend + rules: + - when: manual From 1f962b38553d42c04fe2053546cb29345176fb28 Mon Sep 17 00:00:00 2001 From: zandrewitte Date: Thu, 9 Dec 2021 11:08:33 +0200 Subject: [PATCH 02/81] push deb base and main runner --- .cd-builders/runner7-circle-deb/Makefile | 11 +++++----- .cd-builders/runner7-gitlab-deb/Dockerfile | 9 ++++---- .cd-builders/runner7-gitlab-deb/Makefile | 13 ++++++++--- .gitlab-ci-build-runners.yml | 25 +++++++++++++++++++--- go.mod | 2 +- 5 files changed, 44 insertions(+), 16 deletions(-) diff --git a/.cd-builders/runner7-circle-deb/Makefile b/.cd-builders/runner7-circle-deb/Makefile index 5bd770099b2d11..0baed6fd793e8f 100644 --- a/.cd-builders/runner7-circle-deb/Makefile +++ b/.cd-builders/runner7-circle-deb/Makefile @@ -1,18 +1,19 @@ RUNTIMETAG := $(shell date +%Y%m%d) +DOCKER_REPOSITORY ?= docker.io version: echo $(RUNTIMETAG) | tail -1 > version.txt build: - docker build -t docker.io/stackstate/stackstate-agent-runner-circle:deb7_$(RUNTIMETAG) . + docker build -t $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:deb7_$(RUNTIMETAG) . push: - docker push docker.io/stackstate/stackstate-agent-runner-circle:deb7_$(RUNTIMETAG) + docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:deb7_$(RUNTIMETAG) try: - docker run -it docker.io/stackstate/stackstate-agent-runner-circle:deb7_$(RUNTIMETAG) sh + docker run -it $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:deb7_$(RUNTIMETAG) sh tag_latest: - docker tag docker.io/stackstate/stackstate-agent-runner-circle:deb7_$(RUNTIMETAG) docker.io/stackstate/stackstate-agent-runner-circle:deb7_latest + docker tag $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:deb7_$(RUNTIMETAG) docker.io/stackstate/stackstate-agent-runner-circle:deb7_latest push_latest: - docker push docker.io/stackstate/stackstate-agent-runner-circle:deb7_latest + docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:deb7_latest diff --git a/.cd-builders/runner7-gitlab-deb/Dockerfile b/.cd-builders/runner7-gitlab-deb/Dockerfile index f84db15fbeedda..266183bdb85fc8 100644 --- a/.cd-builders/runner7-gitlab-deb/Dockerfile +++ b/.cd-builders/runner7-gitlab-deb/Dockerfile @@ -1,4 +1,5 @@ -FROM docker.io/stackstate/stackstate-agent-runner-circle:deb7_latest +ARG BASE_RUNNER_IMAGE_VERSION=deb7_latest +FROM docker.io/stackstate/stackstate-agent-runner-circle:${BASE_RUNNER_IMAGE_VERSION} RUN DEBIAN_FRONTEND=noninteractive apt-get install -y nano libtool-bin libelf-dev gnupg2 locales RUN echo 'export PATH=$HOME/bin:$PATH' >> /root/.bashrc @@ -16,8 +17,8 @@ ADD rpmmacros /root/.rpmmacros RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \ locale-gen -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US:en -ENV LC_ALL en_US.UTF-8 +ENV LANG en_US.UTF-8 +ENV LANGUAGE en_US:en +ENV LC_ALL en_US.UTF-8 SHELL ["/bin/bash", "-c"] diff --git a/.cd-builders/runner7-gitlab-deb/Makefile b/.cd-builders/runner7-gitlab-deb/Makefile index 4e9fa0d14d9b16..7a7b1f8b67f3ce 100644 --- a/.cd-builders/runner7-gitlab-deb/Makefile +++ b/.cd-builders/runner7-gitlab-deb/Makefile @@ -1,6 +1,13 @@ +RUNTIMETAG := $(shell date +%Y%m%d) +DOCKER_REPOSITORY ?= docker.io +BASE_RUNNER_IMAGE_VERSION ?= deb7_latest + +version: + echo $(RUNTIMETAG) | tail -1 > version.txt + build: - docker build -t docker.io/stackstate/stackstate-agent-runner-gitlab:latest7 . + docker build --build-arg BASE_RUNNER_IMAGE_VERSION=$(BASE_RUNNER_IMAGE_VERSION) -t $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb7_$(RUNTIMETAG) . try: - docker run -it docker.io/stackstate/stackstate-agent-runner-gitlab:latest7 bash + docker run -it $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb7_$(RUNTIMETAG) bash push: - docker push docker.io/stackstate/stackstate-agent-runner-gitlab:latest7 + docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb7_$(RUNTIMETAG) diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index 43ec52226ac815..0a56e7a6b2fadf 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -6,18 +6,20 @@ stages: variables: RUNNER7_DEB_BASE: $CI_PROJECT_DIR/.cd-builders/runner7-circle-deb + RUNNER7_MAIN: $CI_PROJECT_DIR/.cd-builders/runner7-gitlab-deb + DOCKER_REPOSITORY: quay.io # produces the base deb image: quay.io/stackstate/stackstate-agent-runner-circle:deb7_{yyyymmdd} -build-v3-deb-base: +build-deb-base: # use ubuntu as the image builder image: ubuntu:20.04 stage: build_runner_base - interruptible: true script: - cd $RUNNER7_DEB_BASE # make the image, try running sh, push the tag to quay, write the version as a artifact - make build try push version + - echo "Produced deb based container version: $(cat $RUNNER7_DEB_BASE/version.txt)" artifacts: name: Base deb image version paths: @@ -28,7 +30,24 @@ build-v3-deb-base: - runner_system_failure - stuck_or_timeout_failure -# image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:latest7 +# image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb7_{yyyymmdd} +build-main-runner: + # use ubuntu as the image builder + image: ubuntu:20.04 + stage: build_runners + needs: [build-deb-base] + script: + - cd RUNNER7_MAIN + - export BASE_RUNNER_IMAGE_VERSION=$(cat $RUNNER7_DEB_BASE/version.txt) + - echo "Using deb base container version: $BASE_RUNNER_IMAGE_VERSION" + # make the image, try running sh, push the tag to quay, write the version as a artifact + - make build try push version + - echo "Produced deb container version: $(cat $RUNNER7_MAIN/version.txt)" + retry: + max: 2 + when: + - runner_system_failure + - stuck_or_timeout_failure # image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7_20211004_v7_0 diff --git a/go.mod b/go.mod index af3bc6ea1118c6..805aef38445517 100644 --- a/go.mod +++ b/go.mod @@ -117,7 +117,7 @@ require ( github.com/opencontainers/runtime-spec v1.0.2 github.com/openshift/api v3.9.1-0.20190924102528-32369d4db2ad+incompatible github.com/patrickmn/go-cache v2.1.0+incompatible - github.com/pborman/uuid v1.2.0 + github.com/pborman/uuid v1.2.0 // indirect github.com/philhofer/fwd v1.0.0 // indirect github.com/pierrec/lz4 v2.5.0+incompatible // indirect github.com/pkg/errors v0.9.1 From 82cd6627d60f0b45bc9152418886733e9f633415 Mon Sep 17 00:00:00 2001 From: zandrewitte Date: Thu, 9 Dec 2021 11:29:08 +0200 Subject: [PATCH 03/81] gitlab ci runners wip --- .gitlab-ci-build-runners.yml | 12 ++--- .gitlab-ci.yml | 86 ++++++++++++++++++------------------ 2 files changed, 49 insertions(+), 49 deletions(-) diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index 0a56e7a6b2fadf..8159c24caa1891 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -1,5 +1,3 @@ - - stages: - build_runner_base - build_runners @@ -17,9 +15,10 @@ build-deb-base: stage: build_runner_base script: - cd $RUNNER7_DEB_BASE - # make the image, try running sh, push the tag to quay, write the version as a artifact + # make the image, try running sh, push the tag to quay, write the version as a artifact - make build try push version - - echo "Produced deb based container version: $(cat $RUNNER7_DEB_BASE/version.txt)" + - export BASE_RUNNER_IMAGE_VERSION="$(cat $RUNNER7_DEB_BASE/version.txt)" + - echo Produced deb based container version $BASE_RUNNER_IMAGE_VERSION artifacts: name: Base deb image version paths: @@ -38,11 +37,12 @@ build-main-runner: needs: [build-deb-base] script: - cd RUNNER7_MAIN - - export BASE_RUNNER_IMAGE_VERSION=$(cat $RUNNER7_DEB_BASE/version.txt) + - export BASE_RUNNER_IMAGE_VERSION="$(cat $RUNNER7_DEB_BASE/version.txt)" - echo "Using deb base container version: $BASE_RUNNER_IMAGE_VERSION" # make the image, try running sh, push the tag to quay, write the version as a artifact - make build try push version - - echo "Produced deb container version: $(cat $RUNNER7_MAIN/version.txt)" + - export MAIN_RUNNER_IMAGE_VERSION=$(cat $RUNNER7_MAIN/version.txt) + - echo Produced deb container version $MAIN_RUNNER_IMAGE_VERSION retry: max: 2 when: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f814226d749329..0825fb510ed08f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -99,49 +99,49 @@ variables: &commonvariables if: $CI_COMMIT_TAG =~ /3\..*/ when: never -agent2: - stage: triggers - variables: - <<: *commonvariables - <<: *agent2_variables - trigger: - include: .gitlab-ci-agent.yml - strategy: depend - rules: - - <<: *exclude_on_cluster_agent - # exclude this pipeline if we're running a v3 tag pipeline - - <<: *exclude_on_tag_v3 - - if: $CI_COMMIT_MESSAGE =~ /\[py3]/ - when: never - - when: on_success - -agent3: - stage: triggers - variables: - <<: *commonvariables - <<: *agent3_variables - trigger: - include: .gitlab-ci-agent.yml - strategy: depend - rules: - - <<: *exclude_on_cluster_agent - # exclude this pipeline if we're running a v2 tag pipeline - - <<: *exclude_on_tag_v2 - - if: $CI_COMMIT_MESSAGE =~ /\[py2]/ - when: never - - when: on_success - -cluster_agent: - stage: triggers - variables: - <<: *commonvariables - <<: *agent3_variables - trigger: - include: .gitlab-ci-cluster-agent.yml - strategy: depend - rules: - - <<: *include_on_cluster_agent - - when: never +#agent2: +# stage: triggers +# variables: +# <<: *commonvariables +# <<: *agent2_variables +# trigger: +# include: .gitlab-ci-agent.yml +# strategy: depend +# rules: +# - <<: *exclude_on_cluster_agent +# # exclude this pipeline if we're running a v3 tag pipeline +# - <<: *exclude_on_tag_v3 +# - if: $CI_COMMIT_MESSAGE =~ /\[py3]/ +# when: never +# - when: on_success +# +#agent3: +# stage: triggers +# variables: +# <<: *commonvariables +# <<: *agent3_variables +# trigger: +# include: .gitlab-ci-agent.yml +# strategy: depend +# rules: +# - <<: *exclude_on_cluster_agent +# # exclude this pipeline if we're running a v2 tag pipeline +# - <<: *exclude_on_tag_v2 +# - if: $CI_COMMIT_MESSAGE =~ /\[py2]/ +# when: never +# - when: on_success +# +#cluster_agent: +# stage: triggers +# variables: +# <<: *commonvariables +# <<: *agent3_variables +# trigger: +# include: .gitlab-ci-cluster-agent.yml +# strategy: depend +# rules: +# - <<: *include_on_cluster_agent +# - when: never build_runners: stage: triggers From 6bc0ba6c0858316db7f452049a8680854172486f Mon Sep 17 00:00:00 2001 From: zandrewitte Date: Thu, 9 Dec 2021 11:33:28 +0200 Subject: [PATCH 04/81] gitlab ci runners wip --- .gitlab-ci-build-runners.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index 8159c24caa1891..8ba264483ef852 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -38,10 +38,10 @@ build-main-runner: script: - cd RUNNER7_MAIN - export BASE_RUNNER_IMAGE_VERSION="$(cat $RUNNER7_DEB_BASE/version.txt)" - - echo "Using deb base container version: $BASE_RUNNER_IMAGE_VERSION" + - echo Using deb base container version $BASE_RUNNER_IMAGE_VERSION # make the image, try running sh, push the tag to quay, write the version as a artifact - make build try push version - - export MAIN_RUNNER_IMAGE_VERSION=$(cat $RUNNER7_MAIN/version.txt) + - export MAIN_RUNNER_IMAGE_VERSION="$(cat $RUNNER7_MAIN/version.txt)" - echo Produced deb container version $MAIN_RUNNER_IMAGE_VERSION retry: max: 2 From f41ffee6943ccead4f3e90e47cb825c9350424d0 Mon Sep 17 00:00:00 2001 From: zandrewitte Date: Thu, 9 Dec 2021 12:14:00 +0200 Subject: [PATCH 05/81] build runners using docker --- .gitlab-ci-build-runners.yml | 38 +++++++++++++++++++++--------------- .gitlab-ci.yml | 2 +- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index 8ba264483ef852..354d0581588a92 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -10,19 +10,21 @@ variables: # produces the base deb image: quay.io/stackstate/stackstate-agent-runner-circle:deb7_{yyyymmdd} build-deb-base: - # use ubuntu as the image builder - image: ubuntu:20.04 + # use docker as the image builder + image: artifactory.stackstate.io/docker-virtual/docker:18.06.0 + variables: + DOCKER_DRIVER: overlay + DOCKER_HOST: tcp://docker:2375 + DOCKER_TLS_CERTDIR: "" stage: build_runner_base script: - cd $RUNNER7_DEB_BASE - # make the image, try running sh, push the tag to quay, write the version as a artifact - - make build try push version - - export BASE_RUNNER_IMAGE_VERSION="$(cat $RUNNER7_DEB_BASE/version.txt)" - - echo Produced deb based container version $BASE_RUNNER_IMAGE_VERSION - artifacts: - name: Base deb image version - paths: - - $RUNNER7_DEB_BASE/version.txt + # get the current date as the base image version + - $BASE_RUNNER_IMAGE_VERSION="deb7_$(date +%Y%m%d)" + # make the image, push the tag to quay + - docker build -t $DOCKER_REPOSITORY/stackstate/stackstate-agent-runner-circle:$BASE_RUNNER_IMAGE_VERSION . + - docker push $DOCKER_REPOSITORY/stackstate/stackstate-agent-runner-circle:$BASE_RUNNER_IMAGE_VERSION + - echo Produced deb based container version deb7_$BASE_RUNNER_IMAGE_VERSION retry: max: 2 when: @@ -31,18 +33,22 @@ build-deb-base: # image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb7_{yyyymmdd} build-main-runner: - # use ubuntu as the image builder - image: ubuntu:20.04 + # use docker as the image builder + image: artifactory.stackstate.io/docker-virtual/docker:18.06.0 + variables: + DOCKER_DRIVER: overlay + DOCKER_HOST: tcp://docker:2375 + DOCKER_TLS_CERTDIR: "" stage: build_runners needs: [build-deb-base] script: - cd RUNNER7_MAIN - - export BASE_RUNNER_IMAGE_VERSION="$(cat $RUNNER7_DEB_BASE/version.txt)" + # get the current date as the base image version + - $BASE_RUNNER_IMAGE_VERSION="deb7_$(date +%Y%m%d)" - echo Using deb base container version $BASE_RUNNER_IMAGE_VERSION # make the image, try running sh, push the tag to quay, write the version as a artifact - - make build try push version - - export MAIN_RUNNER_IMAGE_VERSION="$(cat $RUNNER7_MAIN/version.txt)" - - echo Produced deb container version $MAIN_RUNNER_IMAGE_VERSION + - docker build --build-arg BASE_RUNNER_IMAGE_VERSION=$BASE_RUNNER_IMAGE_VERSION -t $DOCKER_REPOSITORY/stackstate/stackstate-agent-runner-gitlab:$BASE_RUNNER_IMAGE_VERSION . + - docker push $DOCKER_REPOSITORY/stackstate/stackstate-agent-runner-gitlab:$BASE_RUNNER_IMAGE_VERSION retry: max: 2 when: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0825fb510ed08f..9ecf205845ac03 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -151,4 +151,4 @@ build_runners: include: .gitlab-ci-build-runners.yml strategy: depend rules: - - when: manual + - when: on_success From 7aa81c349d06a319e48990672c813788f15af185 Mon Sep 17 00:00:00 2001 From: zandrewitte Date: Thu, 9 Dec 2021 12:16:52 +0200 Subject: [PATCH 06/81] build runners using docker --- .gitlab-ci-build-runners.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index 354d0581588a92..1b59320be0da23 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -1,3 +1,5 @@ +image: artifactory.tooling.stackstate.io/docker-virtual/docker:18.06.0 + stages: - build_runner_base - build_runners @@ -11,7 +13,6 @@ variables: # produces the base deb image: quay.io/stackstate/stackstate-agent-runner-circle:deb7_{yyyymmdd} build-deb-base: # use docker as the image builder - image: artifactory.stackstate.io/docker-virtual/docker:18.06.0 variables: DOCKER_DRIVER: overlay DOCKER_HOST: tcp://docker:2375 @@ -33,8 +34,6 @@ build-deb-base: # image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb7_{yyyymmdd} build-main-runner: - # use docker as the image builder - image: artifactory.stackstate.io/docker-virtual/docker:18.06.0 variables: DOCKER_DRIVER: overlay DOCKER_HOST: tcp://docker:2375 From 493c2a46fd5428268911167a41ed3050301128cd Mon Sep 17 00:00:00 2001 From: zandrewitte Date: Thu, 9 Dec 2021 12:20:00 +0200 Subject: [PATCH 07/81] cleanup / fixes --- .gitlab-ci-build-runners.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index 1b59320be0da23..bae2c494492f99 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -9,7 +9,6 @@ variables: RUNNER7_MAIN: $CI_PROJECT_DIR/.cd-builders/runner7-gitlab-deb DOCKER_REPOSITORY: quay.io - # produces the base deb image: quay.io/stackstate/stackstate-agent-runner-circle:deb7_{yyyymmdd} build-deb-base: # use docker as the image builder @@ -25,7 +24,7 @@ build-deb-base: # make the image, push the tag to quay - docker build -t $DOCKER_REPOSITORY/stackstate/stackstate-agent-runner-circle:$BASE_RUNNER_IMAGE_VERSION . - docker push $DOCKER_REPOSITORY/stackstate/stackstate-agent-runner-circle:$BASE_RUNNER_IMAGE_VERSION - - echo Produced deb based container version deb7_$BASE_RUNNER_IMAGE_VERSION + - echo Produced deb based container version $BASE_RUNNER_IMAGE_VERSION retry: max: 2 when: From d6be4cc42d77cdd64432341de5c3c699fe1b5029 Mon Sep 17 00:00:00 2001 From: zandrewitte Date: Thu, 9 Dec 2021 12:21:06 +0200 Subject: [PATCH 08/81] use shell for date --- .gitlab-ci-build-runners.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index bae2c494492f99..e8065fa2e970c7 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -20,7 +20,7 @@ build-deb-base: script: - cd $RUNNER7_DEB_BASE # get the current date as the base image version - - $BASE_RUNNER_IMAGE_VERSION="deb7_$(date +%Y%m%d)" + - $BASE_RUNNER_IMAGE_VERSION="deb7_$(shell date +%Y%m%d)" # make the image, push the tag to quay - docker build -t $DOCKER_REPOSITORY/stackstate/stackstate-agent-runner-circle:$BASE_RUNNER_IMAGE_VERSION . - docker push $DOCKER_REPOSITORY/stackstate/stackstate-agent-runner-circle:$BASE_RUNNER_IMAGE_VERSION @@ -42,7 +42,7 @@ build-main-runner: script: - cd RUNNER7_MAIN # get the current date as the base image version - - $BASE_RUNNER_IMAGE_VERSION="deb7_$(date +%Y%m%d)" + - $BASE_RUNNER_IMAGE_VERSION="deb7_$(shell date +%Y%m%d)" - echo Using deb base container version $BASE_RUNNER_IMAGE_VERSION # make the image, try running sh, push the tag to quay, write the version as a artifact - docker build --build-arg BASE_RUNNER_IMAGE_VERSION=$BASE_RUNNER_IMAGE_VERSION -t $DOCKER_REPOSITORY/stackstate/stackstate-agent-runner-gitlab:$BASE_RUNNER_IMAGE_VERSION . From 798c37ff3d429ea4eed22aedd24378b455df2a6c Mon Sep 17 00:00:00 2001 From: zandrewitte Date: Thu, 9 Dec 2021 12:27:10 +0200 Subject: [PATCH 09/81] Fix version discovery --- .gitlab-ci-build-runners.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index e8065fa2e970c7..3307d5842cbe81 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -20,7 +20,7 @@ build-deb-base: script: - cd $RUNNER7_DEB_BASE # get the current date as the base image version - - $BASE_RUNNER_IMAGE_VERSION="deb7_$(shell date +%Y%m%d)" + - BASE_RUNNER_IMAGE_VERSION="deb7_$(date +%Y%m%d)" # make the image, push the tag to quay - docker build -t $DOCKER_REPOSITORY/stackstate/stackstate-agent-runner-circle:$BASE_RUNNER_IMAGE_VERSION . - docker push $DOCKER_REPOSITORY/stackstate/stackstate-agent-runner-circle:$BASE_RUNNER_IMAGE_VERSION @@ -42,7 +42,7 @@ build-main-runner: script: - cd RUNNER7_MAIN # get the current date as the base image version - - $BASE_RUNNER_IMAGE_VERSION="deb7_$(shell date +%Y%m%d)" + - BASE_RUNNER_IMAGE_VERSION="deb7_$(date +%Y%m%d)" - echo Using deb base container version $BASE_RUNNER_IMAGE_VERSION # make the image, try running sh, push the tag to quay, write the version as a artifact - docker build --build-arg BASE_RUNNER_IMAGE_VERSION=$BASE_RUNNER_IMAGE_VERSION -t $DOCKER_REPOSITORY/stackstate/stackstate-agent-runner-gitlab:$BASE_RUNNER_IMAGE_VERSION . From 2a9e14c0a2133b0aca6430a268b08341a3fee2c4 Mon Sep 17 00:00:00 2001 From: zandrewitte Date: Thu, 9 Dec 2021 12:41:12 +0200 Subject: [PATCH 10/81] add docker service --- .gitlab-ci-build-runners.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index 3307d5842cbe81..0345fabc9ec795 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -1,5 +1,3 @@ -image: artifactory.tooling.stackstate.io/docker-virtual/docker:18.06.0 - stages: - build_runner_base - build_runners @@ -9,13 +7,20 @@ variables: RUNNER7_MAIN: $CI_PROJECT_DIR/.cd-builders/runner7-gitlab-deb DOCKER_REPOSITORY: quay.io -# produces the base deb image: quay.io/stackstate/stackstate-agent-runner-circle:deb7_{yyyymmdd} -build-deb-base: +.docker_build_base: &docker_build_base # use docker as the image builder + image: artifactory.tooling.stackstate.io/docker-virtual/docker:18.06.0 variables: DOCKER_DRIVER: overlay DOCKER_HOST: tcp://docker:2375 DOCKER_TLS_CERTDIR: "" + services: + - name: artifactory.tooling.stackstate.io/docker-virtual/docker:18.09-dind + alias: docker + +# produces the base deb image: quay.io/stackstate/stackstate-agent-runner-circle:deb7_{yyyymmdd} +build-deb-base: + <<: *docker_build_base stage: build_runner_base script: - cd $RUNNER7_DEB_BASE @@ -33,10 +38,7 @@ build-deb-base: # image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb7_{yyyymmdd} build-main-runner: - variables: - DOCKER_DRIVER: overlay - DOCKER_HOST: tcp://docker:2375 - DOCKER_TLS_CERTDIR: "" + <<: *docker_build_base stage: build_runners needs: [build-deb-base] script: From 7a8d39e4543c06b218dd76e855bacf18f1e6eaed Mon Sep 17 00:00:00 2001 From: zandrewitte Date: Thu, 9 Dec 2021 17:31:21 +0200 Subject: [PATCH 11/81] update base deb image building --- .cd-builders/runner7-circle-deb/Dockerfile | 9 +- .../rvm/gpg-keys/mpapis.asc | 580 ------------------ .../rvm/gpg-keys/pkuczynski.asc | 51 -- 3 files changed, 4 insertions(+), 636 deletions(-) delete mode 100644 .cd-builders/runner7-circle-deb/rvm/gpg-keys/mpapis.asc delete mode 100644 .cd-builders/runner7-circle-deb/rvm/gpg-keys/pkuczynski.asc diff --git a/.cd-builders/runner7-circle-deb/Dockerfile b/.cd-builders/runner7-circle-deb/Dockerfile index 719cc7c3732516..c51cf0c41742fa 100644 --- a/.cd-builders/runner7-circle-deb/Dockerfile +++ b/.cd-builders/runner7-circle-deb/Dockerfile @@ -10,7 +10,7 @@ ARG GIMME_GO_VERSION=1.13.11 ARG DD_CONDA_VERSION=4.7.10 ARG DD_PIP_VERSION=19.1 ARG DD_SETUPTOOLS_VERSION=41.0.1 -ARG IBM_MQ_VERSION=9.1.5.0 +ARG IBM_MQ_VERSION=9.2.4.0 ARG CMAKE_VERSION=3.14.4 ARG CLANG_VERSION=8.0.0 @@ -74,10 +74,9 @@ COPY ./conda.sh /etc/profile.d/ # RVM # [VS] -COPY ./rvm/gpg-keys /gpg-keys -RUN gpg --import /gpg-keys/* -RUN rm -rf /gpg-keys -RUN curl -sSL https://get.rvm.io | bash -s stable --version latest-1.29 +RUN curl -sSL https://rvm.io/mpapis.asc | gpg --import - +RUN curl -sSL https://rvm.io/pkuczynski.asc | gpg --import - +RUN curl -sSL https://raw.githubusercontent.com/rvm/rvm/master/binscripts/rvm-installer | bash -s stable --version latest-1.29 # # Ruby,,, RUN mkdir -p /usr/local/etc \ diff --git a/.cd-builders/runner7-circle-deb/rvm/gpg-keys/mpapis.asc b/.cd-builders/runner7-circle-deb/rvm/gpg-keys/mpapis.asc deleted file mode 100644 index 02a36a29b5f04b..00000000000000 --- a/.cd-builders/runner7-circle-deb/rvm/gpg-keys/mpapis.asc +++ /dev/null @@ -1,580 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2 - -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 -8wvlb9/is1iN7h7+s2GDPpvEJrrnpeHeNTX1BEeykvbjW+Bsb89g6kJfks7PvhD+ -BQwVMaNrmjR8KYi+GaopHdQ30yLWD4ck97B+UYZnqSKk7E8NOpwU22b31VlZgI/J -XWeXgQ5cY58J0ShGmbfypHXerthzlm6UHzjg6g+yujqDrxaOPTdfxYAzJmX5ztk3 -D9xMEhCAD8ypefTdMGQb0B2q5Yjsl3sHqNNqxTeg1iorUNz6UtEhX3RmGrTDdY0r -gn0prjgiMTEMWWxAmgeYw/gOkpWfEZNrX64La65OkhTg+aBZEe6broHrc1x6dXpo -RkxGJrlRfcsxOcgy2M0/C0gk1L1yYWXRL4yENkQ/hNuPZmdDtrvWxcSTnMPfclwq -6kklflC099ujCZf5NuOG80mZi03917LQBtgWp4INmG+B6aLY52KuINmWXm25wYPY -5MfEbyO2KzngJSpxdR90GbP4F5lri2Ho9eSByisb0dLq0ugBEAABAQAAAAAAAAAA -AAAAAP/Y/+AAEEpGSUYAAQEBAGAAYAAA/+EAQEV4aWYAAElJKgAIAAAAAQBphwQA -AQAAABoAAAAAAAAAAgACoAkAAQAAAJ8AAAADoAkAAQAAAJ8AAAAAAAAA/9sAQwAI -BgYHBgUIBwcHCQkICgwUDQwLCwwZEhMPFB0aHx4dGhwcICQuJyAiLCMcHCg3KSww -MTQ0NB8nOT04MjwuMzQy/9sAQwEJCQkMCwwYDQ0YMiEcITIyMjIyMjIyMjIyMjIy -MjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy/8AAEQgAnwCfAwEi -AAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIB -AwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNi -coIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0 -dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfI -ycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEA -AAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYS -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 -2lPgP440izPGh5s38Oc= -=8riE ------END PGP PUBLIC KEY BLOCK----- diff --git a/.cd-builders/runner7-circle-deb/rvm/gpg-keys/pkuczynski.asc b/.cd-builders/runner7-circle-deb/rvm/gpg-keys/pkuczynski.asc deleted file mode 100644 index e5c71748a8701e..00000000000000 --- a/.cd-builders/runner7-circle-deb/rvm/gpg-keys/pkuczynski.asc +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -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 -iWTuv7mXY0bNG+s= -=X3ZS ------END PGP PUBLIC KEY BLOCK----- From 1b808e5a199489ac7a3330b4cf59e17a1fb50220 Mon Sep 17 00:00:00 2001 From: zandrewitte Date: Fri, 10 Dec 2021 10:52:21 +0200 Subject: [PATCH 12/81] login to docker registry --- .gitlab-ci-build-runners.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index 0345fabc9ec795..9f14d35fe7b7b6 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -5,7 +5,12 @@ stages: variables: RUNNER7_DEB_BASE: $CI_PROJECT_DIR/.cd-builders/runner7-circle-deb RUNNER7_MAIN: $CI_PROJECT_DIR/.cd-builders/runner7-gitlab-deb - DOCKER_REPOSITORY: quay.io + DOCKER_REGISTRY: quay.io + QUAY_REGISTRY: quay.io + +before_script: + - docker login -u "${docker_user}" -p "${docker_password}" "${DOCKER_REGISTRY}" + - docker login -u "${quay_user}" -p "${quay_password}" "${QUAY_REGISTRY}" .docker_build_base: &docker_build_base # use docker as the image builder From 5c04d96797676577453c56c0ca67762d404b21a8 Mon Sep 17 00:00:00 2001 From: zandrewitte Date: Fri, 10 Dec 2021 10:57:55 +0200 Subject: [PATCH 13/81] push to docker and quay --- .gitlab-ci-build-runners.yml | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index 9f14d35fe7b7b6..a405e2345831ed 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -5,10 +5,11 @@ stages: variables: RUNNER7_DEB_BASE: $CI_PROJECT_DIR/.cd-builders/runner7-circle-deb RUNNER7_MAIN: $CI_PROJECT_DIR/.cd-builders/runner7-gitlab-deb - DOCKER_REGISTRY: quay.io + DOCKER_REGISTRY: docker.io QUAY_REGISTRY: quay.io before_script: + # login to both docker registries - docker login -u "${docker_user}" -p "${docker_password}" "${DOCKER_REGISTRY}" - docker login -u "${quay_user}" -p "${quay_password}" "${QUAY_REGISTRY}" @@ -31,9 +32,12 @@ build-deb-base: - cd $RUNNER7_DEB_BASE # get the current date as the base image version - BASE_RUNNER_IMAGE_VERSION="deb7_$(date +%Y%m%d)" - # make the image, push the tag to quay - - docker build -t $DOCKER_REPOSITORY/stackstate/stackstate-agent-runner-circle:$BASE_RUNNER_IMAGE_VERSION . - - docker push $DOCKER_REPOSITORY/stackstate/stackstate-agent-runner-circle:$BASE_RUNNER_IMAGE_VERSION + # make the image, push the tag to docker + - docker build -t $DOCKER_REGISTRY/stackstate/stackstate-agent-runner-circle:$BASE_RUNNER_IMAGE_VERSION . + - docker push $DOCKER_REGISTRY/stackstate/stackstate-agent-runner-circle:$BASE_RUNNER_IMAGE_VERSION + # make the image, push the tag to docker + - docker build -t $QUAY_REGISTRY/stackstate/stackstate-agent-runner-circle:$BASE_RUNNER_IMAGE_VERSION . + - docker push $QUAY_REGISTRY/stackstate/stackstate-agent-runner-circle:$BASE_RUNNER_IMAGE_VERSION - echo Produced deb based container version $BASE_RUNNER_IMAGE_VERSION retry: max: 2 @@ -51,9 +55,12 @@ build-main-runner: # get the current date as the base image version - BASE_RUNNER_IMAGE_VERSION="deb7_$(date +%Y%m%d)" - echo Using deb base container version $BASE_RUNNER_IMAGE_VERSION - # make the image, try running sh, push the tag to quay, write the version as a artifact - - docker build --build-arg BASE_RUNNER_IMAGE_VERSION=$BASE_RUNNER_IMAGE_VERSION -t $DOCKER_REPOSITORY/stackstate/stackstate-agent-runner-gitlab:$BASE_RUNNER_IMAGE_VERSION . - - docker push $DOCKER_REPOSITORY/stackstate/stackstate-agent-runner-gitlab:$BASE_RUNNER_IMAGE_VERSION + # make the image, push the tag to docker + - docker build --build-arg BASE_RUNNER_IMAGE_VERSION=$BASE_RUNNER_IMAGE_VERSION -t $DOCKER_REGISTRY/stackstate/stackstate-agent-runner-gitlab:$BASE_RUNNER_IMAGE_VERSION . + - docker push $DOCKER_REGISTRY/stackstate/stackstate-agent-runner-gitlab:$BASE_RUNNER_IMAGE_VERSION + # make the image, push the tag to quay + - docker build --build-arg BASE_RUNNER_IMAGE_VERSION=$BASE_RUNNER_IMAGE_VERSION -t $QUAY_REGISTRY/stackstate/stackstate-agent-runner-gitlab:$BASE_RUNNER_IMAGE_VERSION . + - docker push $QUAY_REGISTRY/stackstate/stackstate-agent-runner-gitlab:$BASE_RUNNER_IMAGE_VERSION retry: max: 2 when: From a234f2371fcbc50c4f0271b44bcc657137450b8c Mon Sep 17 00:00:00 2001 From: zandrewitte Date: Fri, 10 Dec 2021 11:52:55 +0200 Subject: [PATCH 14/81] disable quay for now --- .gitlab-ci-build-runners.yml | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index a405e2345831ed..d50fc1570364eb 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -32,13 +32,17 @@ build-deb-base: - cd $RUNNER7_DEB_BASE # get the current date as the base image version - BASE_RUNNER_IMAGE_VERSION="deb7_$(date +%Y%m%d)" - # make the image, push the tag to docker - - docker build -t $DOCKER_REGISTRY/stackstate/stackstate-agent-runner-circle:$BASE_RUNNER_IMAGE_VERSION . - - docker push $DOCKER_REGISTRY/stackstate/stackstate-agent-runner-circle:$BASE_RUNNER_IMAGE_VERSION - # make the image, push the tag to docker - - docker build -t $QUAY_REGISTRY/stackstate/stackstate-agent-runner-circle:$BASE_RUNNER_IMAGE_VERSION . - - docker push $QUAY_REGISTRY/stackstate/stackstate-agent-runner-circle:$BASE_RUNNER_IMAGE_VERSION - - echo Produced deb based container version $BASE_RUNNER_IMAGE_VERSION + # build the base image + - BUILD_TAG="stackstate-agent-runner-circle:${BASE_RUNNER_IMAGE_VERSION}" + - docker build -t $BUILD_TAG . + # tag the image, push to docker + - DOCKER_TAG="${DOCKER_REGISTRY}/stackstate/${BUILD_TAG}" + - docker tag "${BUILD_TAG}" "${DOCKER_TAG}" + - docker push $DOCKER_TAG + # tag the image, push to quay +# - QUAY_TAG="${QUAY_REGISTRY}/stackstate/${BUILD_TAG}" +# - docker tag "${BUILD_TAG}" "${DOCKER_TAG}" +# - docker push $QUAY_TAG retry: max: 2 when: @@ -55,12 +59,16 @@ build-main-runner: # get the current date as the base image version - BASE_RUNNER_IMAGE_VERSION="deb7_$(date +%Y%m%d)" - echo Using deb base container version $BASE_RUNNER_IMAGE_VERSION - # make the image, push the tag to docker - - docker build --build-arg BASE_RUNNER_IMAGE_VERSION=$BASE_RUNNER_IMAGE_VERSION -t $DOCKER_REGISTRY/stackstate/stackstate-agent-runner-gitlab:$BASE_RUNNER_IMAGE_VERSION . - - docker push $DOCKER_REGISTRY/stackstate/stackstate-agent-runner-gitlab:$BASE_RUNNER_IMAGE_VERSION - # make the image, push the tag to quay - - docker build --build-arg BASE_RUNNER_IMAGE_VERSION=$BASE_RUNNER_IMAGE_VERSION -t $QUAY_REGISTRY/stackstate/stackstate-agent-runner-gitlab:$BASE_RUNNER_IMAGE_VERSION . - - docker push $QUAY_REGISTRY/stackstate/stackstate-agent-runner-gitlab:$BASE_RUNNER_IMAGE_VERSION + - BUILD_TAG="stackstate-agent-runner-gitlab:${BASE_RUNNER_IMAGE_VERSION}" + - docker build --build-arg BASE_RUNNER_IMAGE_VERSION=$BASE_RUNNER_IMAGE_VERSION -t $BUILD_TAG . + # tag the image, push to docker + - DOCKER_TAG="${DOCKER_REGISTRY}/stackstate/${BUILD_TAG}" + - docker tag "${BUILD_TAG}" "${DOCKER_TAG}" + - docker push $DOCKER_TAG + # tag the image, push to quay +# - QUAY_TAG="${QUAY_REGISTRY}/stackstate/${BUILD_TAG}" +# - docker tag "${BUILD_TAG}" "${DOCKER_TAG}" +# - docker push $QUAY_TAG retry: max: 2 when: From 2842636059ba126975ea51226fa4536a8103b969 Mon Sep 17 00:00:00 2001 From: zandrewitte Date: Fri, 10 Dec 2021 11:56:41 +0200 Subject: [PATCH 15/81] lint fixes --- .gitlab-ci-build-runners.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index d50fc1570364eb..74fa2acbe3741e 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -34,15 +34,15 @@ build-deb-base: - BASE_RUNNER_IMAGE_VERSION="deb7_$(date +%Y%m%d)" # build the base image - BUILD_TAG="stackstate-agent-runner-circle:${BASE_RUNNER_IMAGE_VERSION}" - - docker build -t $BUILD_TAG . + - docker build -t "${BUILD_TAG}" . # tag the image, push to docker - DOCKER_TAG="${DOCKER_REGISTRY}/stackstate/${BUILD_TAG}" - docker tag "${BUILD_TAG}" "${DOCKER_TAG}" - - docker push $DOCKER_TAG + - docker push "${DOCKER_TAG}" # tag the image, push to quay # - QUAY_TAG="${QUAY_REGISTRY}/stackstate/${BUILD_TAG}" # - docker tag "${BUILD_TAG}" "${DOCKER_TAG}" -# - docker push $QUAY_TAG +# - docker push "${QUAY_TAG}" retry: max: 2 when: @@ -60,15 +60,15 @@ build-main-runner: - BASE_RUNNER_IMAGE_VERSION="deb7_$(date +%Y%m%d)" - echo Using deb base container version $BASE_RUNNER_IMAGE_VERSION - BUILD_TAG="stackstate-agent-runner-gitlab:${BASE_RUNNER_IMAGE_VERSION}" - - docker build --build-arg BASE_RUNNER_IMAGE_VERSION=$BASE_RUNNER_IMAGE_VERSION -t $BUILD_TAG . + - docker build --build-arg BASE_RUNNER_IMAGE_VERSION=$BASE_RUNNER_IMAGE_VERSION -t "${BUILD_TAG}" . # tag the image, push to docker - DOCKER_TAG="${DOCKER_REGISTRY}/stackstate/${BUILD_TAG}" - docker tag "${BUILD_TAG}" "${DOCKER_TAG}" - - docker push $DOCKER_TAG + - docker push "${DOCKER_TAG}" # tag the image, push to quay # - QUAY_TAG="${QUAY_REGISTRY}/stackstate/${BUILD_TAG}" # - docker tag "${BUILD_TAG}" "${DOCKER_TAG}" -# - docker push $QUAY_TAG +# - docker push "${QUAY_TAG}" retry: max: 2 when: From 1b26965203db2fdea5e5d597430a455e1a6c1984 Mon Sep 17 00:00:00 2001 From: zandrewitte Date: Fri, 10 Dec 2021 12:14:43 +0200 Subject: [PATCH 16/81] fix cd in runner main --- .gitlab-ci-build-runners.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index 74fa2acbe3741e..2dd6accfc84bf8 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -55,7 +55,7 @@ build-main-runner: stage: build_runners needs: [build-deb-base] script: - - cd RUNNER7_MAIN + - cd $RUNNER7_MAIN # get the current date as the base image version - BASE_RUNNER_IMAGE_VERSION="deb7_$(date +%Y%m%d)" - echo Using deb base container version $BASE_RUNNER_IMAGE_VERSION From 248e95e1b0d102c579f91b4479dcc3c5a94c6fa1 Mon Sep 17 00:00:00 2001 From: zandrewitte Date: Fri, 10 Dec 2021 13:22:32 +0200 Subject: [PATCH 17/81] gitlab ci cleanup / refactor, try publishing deb-rpm publisher --- .../Dockerfile | 3 +- .../runner7-gitlab-deb-rpmpublisher/Makefile | 8 +++- .gitlab-ci-build-runners.yml | 48 ++++++++++++------- 3 files changed, 40 insertions(+), 19 deletions(-) diff --git a/.cd-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile b/.cd-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile index 0ce539f9c03a40..84a3bb2fe24762 100644 --- a/.cd-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile +++ b/.cd-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile @@ -1,4 +1,5 @@ -FROM docker.io/stackstate/stackstate-agent-runner-circle:latest +ARG BASE_RUNNER_IMAGE_VERSION=deb7_latest +FROM docker.io/stackstate/stackstate-agent-runner-circle:${BASE_RUNNER_IMAGE_VERSION} RUN pip install boto3 sa-rpm-s3 invoke distro==1.4.0 awscli==1.16 RUN apt update && apt-get install -y libkrb5-dev unixodbc-dev rpm python-deltarpm createrepo yum-utils diff --git a/.cd-builders/runner7-gitlab-deb-rpmpublisher/Makefile b/.cd-builders/runner7-gitlab-deb-rpmpublisher/Makefile index 46b0b6a9a7cd99..e12da2ad1b3be4 100644 --- a/.cd-builders/runner7-gitlab-deb-rpmpublisher/Makefile +++ b/.cd-builders/runner7-gitlab-deb-rpmpublisher/Makefile @@ -1,4 +1,8 @@ +RUNTIMETAG := $(shell date +%Y%m%d) +DOCKER_REPOSITORY ?= docker.io +BASE_RUNNER_IMAGE_VERSION ?= deb7_latest + build: - docker build -t docker.io/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher . + docker build --build-arg BASE_RUNNER_IMAGE_VERSION=$(BASE_RUNNER_IMAGE_VERSION) -t $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_$(RUNTIMETAG) . push: - docker push docker.io/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher + docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_$(RUNTIMETAG) diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index 2dd6accfc84bf8..7810ee5e649207 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -5,6 +5,7 @@ stages: variables: RUNNER7_DEB_BASE: $CI_PROJECT_DIR/.cd-builders/runner7-circle-deb RUNNER7_MAIN: $CI_PROJECT_DIR/.cd-builders/runner7-gitlab-deb + RUNNER7_DEB_RPM_PUBLISHER: $CI_PROJECT_DIR/.cd-builders/runner7-gitlab-deb-rpmpublisher DOCKER_REGISTRY: docker.io QUAY_REGISTRY: quay.io @@ -23,6 +24,11 @@ before_script: services: - name: artifactory.tooling.stackstate.io/docker-virtual/docker:18.09-dind alias: docker + retry: + max: 2 + when: + - runner_system_failure + - stuck_or_timeout_failure # produces the base deb image: quay.io/stackstate/stackstate-agent-runner-circle:deb7_{yyyymmdd} build-deb-base: @@ -43,23 +49,22 @@ build-deb-base: # - QUAY_TAG="${QUAY_REGISTRY}/stackstate/${BUILD_TAG}" # - docker tag "${BUILD_TAG}" "${DOCKER_TAG}" # - docker push "${QUAY_TAG}" - retry: - max: 2 - when: - - runner_system_failure - - stuck_or_timeout_failure -# image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb7_{yyyymmdd} -build-main-runner: + +################################################################################## +# BUILD IMAGES BASED ON DEB IMAGE BASE +################################################################################# + +.docker_deb_build_base: &docker_deb_build_base <<: *docker_build_base stage: build_runners - needs: [build-deb-base] + needs: [ build-deb-base ] script: - - cd $RUNNER7_MAIN + - cd $RUNNER_DIR # get the current date as the base image version - BASE_RUNNER_IMAGE_VERSION="deb7_$(date +%Y%m%d)" - echo Using deb base container version $BASE_RUNNER_IMAGE_VERSION - - BUILD_TAG="stackstate-agent-runner-gitlab:${BASE_RUNNER_IMAGE_VERSION}" + - BUILD_TAG="stackstate-agent-runner-gitlab:${RUNNER_IMAGE_VERSION}" - docker build --build-arg BASE_RUNNER_IMAGE_VERSION=$BASE_RUNNER_IMAGE_VERSION -t "${BUILD_TAG}" . # tag the image, push to docker - DOCKER_TAG="${DOCKER_REGISTRY}/stackstate/${BUILD_TAG}" @@ -69,14 +74,25 @@ build-main-runner: # - QUAY_TAG="${QUAY_REGISTRY}/stackstate/${BUILD_TAG}" # - docker tag "${BUILD_TAG}" "${DOCKER_TAG}" # - docker push "${QUAY_TAG}" - retry: - max: 2 - when: - - runner_system_failure - - stuck_or_timeout_failure + + +# image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb7_{yyyymmdd} +build-main-deb-runner: + <<: *docker_build_base + <<: *docker_deb_build_base + variables: + RUNNER_DIR: $RUNNER7_MAIN + RUNNER_IMAGE_VERSION: "deb7_$(date +%Y%m%d)" + +# image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_{yyyymmdd} +build-deb-rpm-publisher: + <<: *docker_build_base + <<: *docker_deb_build_base + variables: + RUNNER_DIR: $RUNNER7_DEB_RPM_PUBLISHER + RUNNER_IMAGE_VERSION: "deb-rpmpublisher_$(date +%Y%m%d)" # image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7_20211004_v7_0 # image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos6_20190429 -# image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher From fb0726a67f8c8a13fcb39c7b0fdac4ecb4aa1850 Mon Sep 17 00:00:00 2001 From: zandrewitte Date: Fri, 10 Dec 2021 13:38:18 +0200 Subject: [PATCH 18/81] produce centos7 container --- .cd-builders/runner7-circle-deb/Makefile | 6 ++++- .cd-builders/runner7-circle-rpm7/Dockerfile | 3 +-- .cd-builders/runner7-circle-rpm7/Makefile | 13 +++++++--- .gitlab-ci-build-runners.yml | 28 ++++++++++++++++----- 4 files changed, 37 insertions(+), 13 deletions(-) diff --git a/.cd-builders/runner7-circle-deb/Makefile b/.cd-builders/runner7-circle-deb/Makefile index 0baed6fd793e8f..eeec100fb6e838 100644 --- a/.cd-builders/runner7-circle-deb/Makefile +++ b/.cd-builders/runner7-circle-deb/Makefile @@ -6,6 +6,10 @@ version: build: docker build -t $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:deb7_$(RUNTIMETAG) . + +tag: + docker tag $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:deb7_$(RUNTIMETAG) $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:deb7_$(RUNTIMETAG) + push: docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:deb7_$(RUNTIMETAG) @@ -13,7 +17,7 @@ try: docker run -it $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:deb7_$(RUNTIMETAG) sh tag_latest: - docker tag $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:deb7_$(RUNTIMETAG) docker.io/stackstate/stackstate-agent-runner-circle:deb7_latest + docker tag $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:deb7_$(RUNTIMETAG) $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:deb7_latest push_latest: docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:deb7_latest diff --git a/.cd-builders/runner7-circle-rpm7/Dockerfile b/.cd-builders/runner7-circle-rpm7/Dockerfile index 259ff8f98cee0c..83850f2f937285 100644 --- a/.cd-builders/runner7-circle-rpm7/Dockerfile +++ b/.cd-builders/runner7-circle-rpm7/Dockerfile @@ -5,8 +5,7 @@ ARG GIMME_GO_VERSION=1.13.11 ARG DD_CONDA_VERSION=4.7.10 ARG DD_PIP_VERSION=19.1 ARG DD_SETUPTOOLS_VERSION=41.0.1 -# 9.1.0.9 -ARG IBM_MQ_VERSION=9.2.0.0 +ARG IBM_MQ_VERSION=9.2.4.0 ARG CMAKE_VERSION=3.14.4 ARG CLANG_VERSION=8.0.0 diff --git a/.cd-builders/runner7-circle-rpm7/Makefile b/.cd-builders/runner7-circle-rpm7/Makefile index b9fc9dc810ace6..9eb6765803b45b 100644 --- a/.cd-builders/runner7-circle-rpm7/Makefile +++ b/.cd-builders/runner7-circle-rpm7/Makefile @@ -1,13 +1,18 @@ RUNTIMETAG := $(shell date +%Y%m%d) +DOCKER_REPOSITORY ?= docker.io + +version: + echo $(RUNTIMETAG) | tail -1 > version.txt build: - docker build -t docker.io/stackstate/stackstate-agent-runner-circle:centos7_$(RUNTIMETAG)_v7 . + docker build -t $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:centos7_$(RUNTIMETAG) . + push: - docker push docker.io/stackstate/stackstate-agent-runner-circle:centos7_$(RUNTIMETAG)_v7 + docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:centos7_$(RUNTIMETAG) tag_latest: - docker tag docker.io/stackstate/stackstate-agent-runner-circle:centos7_$(RUNTIMETAG)_v7 docker.io/stackstate/stackstate-agent-runner-circle:centos7_latest_v7 + docker tag $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:centos7_$(RUNTIMETAG) $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:centos7_latest_v7 push_latest: - docker push docker.io/stackstate/stackstate-agent-runner-circle:centos7_latest_v7 + docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:centos7_latest diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index 7810ee5e649207..2b4a10210a031b 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -6,6 +6,7 @@ variables: RUNNER7_DEB_BASE: $CI_PROJECT_DIR/.cd-builders/runner7-circle-deb RUNNER7_MAIN: $CI_PROJECT_DIR/.cd-builders/runner7-gitlab-deb RUNNER7_DEB_RPM_PUBLISHER: $CI_PROJECT_DIR/.cd-builders/runner7-gitlab-deb-rpmpublisher + RUNNER7_RPM_BASE: $CI_PROJECT_DIR/.cd-builders/runner7-circle-rpm7 DOCKER_REGISTRY: docker.io QUAY_REGISTRY: quay.io @@ -30,14 +31,14 @@ before_script: - runner_system_failure - stuck_or_timeout_failure -# produces the base deb image: quay.io/stackstate/stackstate-agent-runner-circle:deb7_{yyyymmdd} -build-deb-base: +################################################################################## +# BUILD IMAGES BASE FOR DEB + RPM +################################################################################# +.docker_build_runner_base: &docker_build_runner_base <<: *docker_build_base stage: build_runner_base script: - - cd $RUNNER7_DEB_BASE - # get the current date as the base image version - - BASE_RUNNER_IMAGE_VERSION="deb7_$(date +%Y%m%d)" + - cd $RUNNER_DIR # build the base image - BUILD_TAG="stackstate-agent-runner-circle:${BASE_RUNNER_IMAGE_VERSION}" - docker build -t "${BUILD_TAG}" . @@ -45,11 +46,26 @@ build-deb-base: - DOCKER_TAG="${DOCKER_REGISTRY}/stackstate/${BUILD_TAG}" - docker tag "${BUILD_TAG}" "${DOCKER_TAG}" - docker push "${DOCKER_TAG}" - # tag the image, push to quay + # tag the image, push to quay # - QUAY_TAG="${QUAY_REGISTRY}/stackstate/${BUILD_TAG}" # - docker tag "${BUILD_TAG}" "${DOCKER_TAG}" # - docker push "${QUAY_TAG}" +# produces the base deb image: quay.io/stackstate/stackstate-agent-runner-circle:deb7_{yyyymmdd} +build-deb-base: + <<: *docker_build_base + <<: *docker_build_runner_base + variables: + RUNNER_DIR: $RUNNER7_DEB_BASE + BASE_RUNNER_IMAGE_VERSION: "deb7_$(date +%Y%m%d)" + +# produces the base rpm image: quay.io/stackstate/stackstate-agent-runner-circle:centos7_{yyyymmdd} +build-rpm-base: + <<: *docker_build_base + <<: *docker_build_runner_base + variables: + RUNNER_DIR: $RUNNER7_RPM_BASE + BASE_RUNNER_IMAGE_VERSION: "centos7_$(date +%Y%m%d)" ################################################################################## # BUILD IMAGES BASED ON DEB IMAGE BASE From 343294b26a472effb34100ae624f85719bb0bad3 Mon Sep 17 00:00:00 2001 From: zandrewitte Date: Fri, 10 Dec 2021 13:39:33 +0200 Subject: [PATCH 19/81] fix yaml inherit --- .gitlab-ci-build-runners.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index 2b4a10210a031b..b980561323d9c4 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -53,7 +53,6 @@ before_script: # produces the base deb image: quay.io/stackstate/stackstate-agent-runner-circle:deb7_{yyyymmdd} build-deb-base: - <<: *docker_build_base <<: *docker_build_runner_base variables: RUNNER_DIR: $RUNNER7_DEB_BASE @@ -61,7 +60,6 @@ build-deb-base: # produces the base rpm image: quay.io/stackstate/stackstate-agent-runner-circle:centos7_{yyyymmdd} build-rpm-base: - <<: *docker_build_base <<: *docker_build_runner_base variables: RUNNER_DIR: $RUNNER7_RPM_BASE @@ -94,7 +92,6 @@ build-rpm-base: # image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb7_{yyyymmdd} build-main-deb-runner: - <<: *docker_build_base <<: *docker_deb_build_base variables: RUNNER_DIR: $RUNNER7_MAIN @@ -102,7 +99,6 @@ build-main-deb-runner: # image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_{yyyymmdd} build-deb-rpm-publisher: - <<: *docker_build_base <<: *docker_deb_build_base variables: RUNNER_DIR: $RUNNER7_DEB_RPM_PUBLISHER From b71019bde0606cf44f724dca493abc91abb04a13 Mon Sep 17 00:00:00 2001 From: zandrewitte Date: Fri, 10 Dec 2021 13:51:25 +0200 Subject: [PATCH 20/81] produce centos6 runner base --- .cd-builders/runner7-circle-rpm/Dockerfile | 2 +- .cd-builders/runner7-circle-rpm/Makefile | 13 +++++++---- .cd-builders/runner7-circle-rpm7/Makefile | 2 +- .gitlab-ci-build-runners.yml | 26 ++++++++++++++-------- 4 files changed, 28 insertions(+), 15 deletions(-) diff --git a/.cd-builders/runner7-circle-rpm/Dockerfile b/.cd-builders/runner7-circle-rpm/Dockerfile index 0d9b4fae555def..1a836e248e80a4 100644 --- a/.cd-builders/runner7-circle-rpm/Dockerfile +++ b/.cd-builders/runner7-circle-rpm/Dockerfile @@ -5,7 +5,7 @@ ARG GIMME_GO_VERSION=1.13.11 ARG DD_CONDA_VERSION=4.7.10 ARG DD_PIP_VERSION=19.1 ARG DD_SETUPTOOLS_VERSION=41.0.1 -ARG IBM_MQ_VERSION=9.1.5.0 +ARG IBM_MQ_VERSION=9.2.4.0 ARG CMAKE_VERSION=3.14.4 ARG CLANG_VERSION=8.0.0 diff --git a/.cd-builders/runner7-circle-rpm/Makefile b/.cd-builders/runner7-circle-rpm/Makefile index 06a387f0955ab7..2265d3bd624e25 100644 --- a/.cd-builders/runner7-circle-rpm/Makefile +++ b/.cd-builders/runner7-circle-rpm/Makefile @@ -1,13 +1,18 @@ RUNTIMETAG := $(shell date +%Y%m%d) +DOCKER_REPOSITORY ?= docker.io + +version: + echo $(RUNTIMETAG) | tail -1 > version.txt + build: - docker build -t docker.io/stackstate/stackstate-agent-runner-circle:centos6_$(RUNTIMETAG)_v7 . + docker build -t $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:centos6_$(RUNTIMETAG) . push: - docker push docker.io/stackstate/stackstate-agent-runner-circle:centos6_$(RUNTIMETAG)_v7 + docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:centos6_$(RUNTIMETAG) tag_latest: - docker tag docker.io/stackstate/stackstate-agent-runner-circle:centos6_$(RUNTIMETAG)_v7 docker.io/stackstate/stackstate-agent-runner-circle:centos6_latest_v7 + docker tag $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:centos6_$(RUNTIMETAG) $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:centos6_latest push_latest: - docker push docker.io/stackstate/stackstate-agent-runner-circle:centos6_latest_v7 + docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:centos6_latest diff --git a/.cd-builders/runner7-circle-rpm7/Makefile b/.cd-builders/runner7-circle-rpm7/Makefile index 9eb6765803b45b..f1d3fd8c85d8c7 100644 --- a/.cd-builders/runner7-circle-rpm7/Makefile +++ b/.cd-builders/runner7-circle-rpm7/Makefile @@ -11,7 +11,7 @@ push: docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:centos7_$(RUNTIMETAG) tag_latest: - docker tag $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:centos7_$(RUNTIMETAG) $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:centos7_latest_v7 + docker tag $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:centos7_$(RUNTIMETAG) $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:centos7_latest push_latest: docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:centos7_latest diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index b980561323d9c4..211a3f84bfc198 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -3,10 +3,11 @@ stages: - build_runners variables: - RUNNER7_DEB_BASE: $CI_PROJECT_DIR/.cd-builders/runner7-circle-deb - RUNNER7_MAIN: $CI_PROJECT_DIR/.cd-builders/runner7-gitlab-deb - RUNNER7_DEB_RPM_PUBLISHER: $CI_PROJECT_DIR/.cd-builders/runner7-gitlab-deb-rpmpublisher - RUNNER7_RPM_BASE: $CI_PROJECT_DIR/.cd-builders/runner7-circle-rpm7 + RUNNER_DEB_BASE: $CI_PROJECT_DIR/.cd-builders/runner7-circle-deb + RUNNER_DEB: $CI_PROJECT_DIR/.cd-builders/runner7-gitlab-deb + RUNNER_DEB_RPM_PUBLISHER: $CI_PROJECT_DIR/.cd-builders/runner7-gitlab-deb-rpmpublisher + RUNNER_CENTOS6_BASE: $CI_PROJECT_DIR/.cd-builders/runner7-circle-rpm + RUNNER_CENTOS7_BASE: $CI_PROJECT_DIR/.cd-builders/runner7-circle-rpm7 DOCKER_REGISTRY: docker.io QUAY_REGISTRY: quay.io @@ -55,14 +56,21 @@ before_script: build-deb-base: <<: *docker_build_runner_base variables: - RUNNER_DIR: $RUNNER7_DEB_BASE + RUNNER_DIR: $RUNNER_DEB_BASE BASE_RUNNER_IMAGE_VERSION: "deb7_$(date +%Y%m%d)" +# produces the base rpm image: quay.io/stackstate/stackstate-agent-runner-circle:centos6_{yyyymmdd} +build-centos6-base: + <<: *docker_build_runner_base + variables: + RUNNER_DIR: $RUNNER_CENTOS6_BASE + BASE_RUNNER_IMAGE_VERSION: "centos6_$(date +%Y%m%d)" + # produces the base rpm image: quay.io/stackstate/stackstate-agent-runner-circle:centos7_{yyyymmdd} -build-rpm-base: +build-centos7-base: <<: *docker_build_runner_base variables: - RUNNER_DIR: $RUNNER7_RPM_BASE + RUNNER_DIR: $RUNNER7_CENTOS7_BASE BASE_RUNNER_IMAGE_VERSION: "centos7_$(date +%Y%m%d)" ################################################################################## @@ -94,14 +102,14 @@ build-rpm-base: build-main-deb-runner: <<: *docker_deb_build_base variables: - RUNNER_DIR: $RUNNER7_MAIN + RUNNER_DIR: $RUNNER_DEB RUNNER_IMAGE_VERSION: "deb7_$(date +%Y%m%d)" # image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_{yyyymmdd} build-deb-rpm-publisher: <<: *docker_deb_build_base variables: - RUNNER_DIR: $RUNNER7_DEB_RPM_PUBLISHER + RUNNER_DIR: $RUNNER_DEB_RPM_PUBLISHER RUNNER_IMAGE_VERSION: "deb-rpmpublisher_$(date +%Y%m%d)" # image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7_20211004_v7_0 From 8465a9968383faf28a6f1472bd61cc91fd2bccfa Mon Sep 17 00:00:00 2001 From: zandrewitte Date: Fri, 10 Dec 2021 13:54:42 +0200 Subject: [PATCH 21/81] make docker variables global --- .gitlab-ci-build-runners.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index 211a3f84bfc198..707fa16ce91d4e 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -10,6 +10,9 @@ variables: RUNNER_CENTOS7_BASE: $CI_PROJECT_DIR/.cd-builders/runner7-circle-rpm7 DOCKER_REGISTRY: docker.io QUAY_REGISTRY: quay.io + DOCKER_DRIVER: overlay + DOCKER_HOST: tcp://docker:2375 + DOCKER_TLS_CERTDIR: "" before_script: # login to both docker registries @@ -19,10 +22,6 @@ before_script: .docker_build_base: &docker_build_base # use docker as the image builder image: artifactory.tooling.stackstate.io/docker-virtual/docker:18.06.0 - variables: - DOCKER_DRIVER: overlay - DOCKER_HOST: tcp://docker:2375 - DOCKER_TLS_CERTDIR: "" services: - name: artifactory.tooling.stackstate.io/docker-virtual/docker:18.09-dind alias: docker From 2a080182b4d443ec99e61fe4b4aff7eee2b683e7 Mon Sep 17 00:00:00 2001 From: zandrewitte Date: Fri, 10 Dec 2021 13:59:59 +0200 Subject: [PATCH 22/81] fix runner image version variables --- .gitlab-ci-build-runners.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index 707fa16ce91d4e..d360b5899306d2 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -40,7 +40,7 @@ before_script: script: - cd $RUNNER_DIR # build the base image - - BUILD_TAG="stackstate-agent-runner-circle:${BASE_RUNNER_IMAGE_VERSION}" + - BUILD_TAG="stackstate-agent-runner-circle:${BASE_RUNNER_IMAGE_VERSION}_$(date +%Y%m%d)" - docker build -t "${BUILD_TAG}" . # tag the image, push to docker - DOCKER_TAG="${DOCKER_REGISTRY}/stackstate/${BUILD_TAG}" @@ -56,21 +56,21 @@ build-deb-base: <<: *docker_build_runner_base variables: RUNNER_DIR: $RUNNER_DEB_BASE - BASE_RUNNER_IMAGE_VERSION: "deb7_$(date +%Y%m%d)" + BASE_RUNNER_IMAGE_VERSION: "deb7" # produces the base rpm image: quay.io/stackstate/stackstate-agent-runner-circle:centos6_{yyyymmdd} build-centos6-base: <<: *docker_build_runner_base variables: RUNNER_DIR: $RUNNER_CENTOS6_BASE - BASE_RUNNER_IMAGE_VERSION: "centos6_$(date +%Y%m%d)" + BASE_RUNNER_IMAGE_VERSION: "centos6" # produces the base rpm image: quay.io/stackstate/stackstate-agent-runner-circle:centos7_{yyyymmdd} build-centos7-base: <<: *docker_build_runner_base variables: RUNNER_DIR: $RUNNER7_CENTOS7_BASE - BASE_RUNNER_IMAGE_VERSION: "centos7_$(date +%Y%m%d)" + BASE_RUNNER_IMAGE_VERSION: "centos7" ################################################################################## # BUILD IMAGES BASED ON DEB IMAGE BASE @@ -85,7 +85,7 @@ build-centos7-base: # get the current date as the base image version - BASE_RUNNER_IMAGE_VERSION="deb7_$(date +%Y%m%d)" - echo Using deb base container version $BASE_RUNNER_IMAGE_VERSION - - BUILD_TAG="stackstate-agent-runner-gitlab:${RUNNER_IMAGE_VERSION}" + - BUILD_TAG="stackstate-agent-runner-gitlab:${RUNNER_IMAGE_VERSION}_$(date +%Y%m%d)" - docker build --build-arg BASE_RUNNER_IMAGE_VERSION=$BASE_RUNNER_IMAGE_VERSION -t "${BUILD_TAG}" . # tag the image, push to docker - DOCKER_TAG="${DOCKER_REGISTRY}/stackstate/${BUILD_TAG}" @@ -102,14 +102,14 @@ build-main-deb-runner: <<: *docker_deb_build_base variables: RUNNER_DIR: $RUNNER_DEB - RUNNER_IMAGE_VERSION: "deb7_$(date +%Y%m%d)" + RUNNER_IMAGE_VERSION: "deb7" # image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_{yyyymmdd} build-deb-rpm-publisher: <<: *docker_deb_build_base variables: RUNNER_DIR: $RUNNER_DEB_RPM_PUBLISHER - RUNNER_IMAGE_VERSION: "deb-rpmpublisher_$(date +%Y%m%d)" + RUNNER_IMAGE_VERSION: "deb-rpmpublisher" # image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7_20211004_v7_0 From 689f365b17ce3389f523970cb80b02e25408d3ae Mon Sep 17 00:00:00 2001 From: zandrewitte Date: Fri, 10 Dec 2021 14:22:20 +0200 Subject: [PATCH 23/81] skip centos6, generalize main runner base --- .gitlab-ci-build-runners.yml | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index d360b5899306d2..22f462a6e1ce08 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -58,35 +58,36 @@ build-deb-base: RUNNER_DIR: $RUNNER_DEB_BASE BASE_RUNNER_IMAGE_VERSION: "deb7" +# TODO: centos6 is EOL. This might potentially work: https://arstech.net/centos-6-error-yumrepo-error-all-mirror-urls-are-not-using-ftp-http/ +# TODO: skipping it for now # produces the base rpm image: quay.io/stackstate/stackstate-agent-runner-circle:centos6_{yyyymmdd} -build-centos6-base: - <<: *docker_build_runner_base - variables: - RUNNER_DIR: $RUNNER_CENTOS6_BASE - BASE_RUNNER_IMAGE_VERSION: "centos6" +#build-centos6-base: +# <<: *docker_build_runner_base +# variables: +# RUNNER_DIR: $RUNNER_CENTOS6_BASE +# BASE_RUNNER_IMAGE_VERSION: "centos6" # produces the base rpm image: quay.io/stackstate/stackstate-agent-runner-circle:centos7_{yyyymmdd} build-centos7-base: <<: *docker_build_runner_base variables: - RUNNER_DIR: $RUNNER7_CENTOS7_BASE + RUNNER_DIR: $RUNNER_CENTOS7_BASE BASE_RUNNER_IMAGE_VERSION: "centos7" ################################################################################## # BUILD IMAGES BASED ON DEB IMAGE BASE ################################################################################# -.docker_deb_build_base: &docker_deb_build_base +.docker_main_runner_build_base: &docker_main_runner_build_base <<: *docker_build_base stage: build_runners - needs: [ build-deb-base ] script: - cd $RUNNER_DIR # get the current date as the base image version - - BASE_RUNNER_IMAGE_VERSION="deb7_$(date +%Y%m%d)" - - echo Using deb base container version $BASE_RUNNER_IMAGE_VERSION + - BASE_RUNNER_DATED_IMAGE_VERSION="${BASE_RUNNER_IMAGE_VERSION}_$(date +%Y%m%d)" + - echo Using deb base container version $BASE_RUNNER_DATED_IMAGE_VERSION - BUILD_TAG="stackstate-agent-runner-gitlab:${RUNNER_IMAGE_VERSION}_$(date +%Y%m%d)" - - docker build --build-arg BASE_RUNNER_IMAGE_VERSION=$BASE_RUNNER_IMAGE_VERSION -t "${BUILD_TAG}" . + - docker build --build-arg BASE_RUNNER_IMAGE_VERSION=$BASE_RUNNER_DATED_IMAGE_VERSION -t "${BUILD_TAG}" . # tag the image, push to docker - DOCKER_TAG="${DOCKER_REGISTRY}/stackstate/${BUILD_TAG}" - docker tag "${BUILD_TAG}" "${DOCKER_TAG}" @@ -99,17 +100,21 @@ build-centos7-base: # image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb7_{yyyymmdd} build-main-deb-runner: - <<: *docker_deb_build_base + <<: *docker_main_runner_build_base + needs: [ build-deb-base ] variables: RUNNER_DIR: $RUNNER_DEB RUNNER_IMAGE_VERSION: "deb7" + BASE_RUNNER_IMAGE_VERSION: "deb7" # image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_{yyyymmdd} build-deb-rpm-publisher: - <<: *docker_deb_build_base + <<: *docker_main_runner_build_base + needs: [ build-deb-base ] variables: RUNNER_DIR: $RUNNER_DEB_RPM_PUBLISHER RUNNER_IMAGE_VERSION: "deb-rpmpublisher" + BASE_RUNNER_IMAGE_VERSION: "deb7" # image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7_20211004_v7_0 From 06cf52303af86eb56e6ec818ca5055ffcff275f2 Mon Sep 17 00:00:00 2001 From: zandrewitte Date: Fri, 10 Dec 2021 14:34:21 +0200 Subject: [PATCH 24/81] produce centos7 image --- .cd-builders/runner7-gitlab-rpm7/Dockerfile | 3 ++- .cd-builders/runner7-gitlab-rpm7/Makefile | 16 ++++++++------- .gitlab-ci-build-runners.yml | 22 +++++++++++++++------ 3 files changed, 27 insertions(+), 14 deletions(-) diff --git a/.cd-builders/runner7-gitlab-rpm7/Dockerfile b/.cd-builders/runner7-gitlab-rpm7/Dockerfile index 5ac6b7b73fe0be..730e5d01831bde 100644 --- a/.cd-builders/runner7-gitlab-rpm7/Dockerfile +++ b/.cd-builders/runner7-gitlab-rpm7/Dockerfile @@ -1,4 +1,5 @@ -FROM docker.io/stackstate/stackstate-agent-runner-circle:centos7_latest_v7 +ARG BASE_RUNNER_IMAGE_VERSION=centos7_latest +FROM docker.io/stackstate/stackstate-agent-runner-circle:${BASE_RUNNER_IMAGE_VERSION} # force update root certificates, in particular might return DST Root CA X3 RUN yum -y update ca-certificates && yum -y reinstall ca-certificates diff --git a/.cd-builders/runner7-gitlab-rpm7/Makefile b/.cd-builders/runner7-gitlab-rpm7/Makefile index 9bd1c4b6b85813..411b68f188e621 100644 --- a/.cd-builders/runner7-gitlab-rpm7/Makefile +++ b/.cd-builders/runner7-gitlab-rpm7/Makefile @@ -1,10 +1,12 @@ RUNTIMETAG := $(shell date +%Y%m%d) -TRY := 0 +DOCKER_REPOSITORY ?= docker.io +BASE_RUNNER_IMAGE_VERSION ?= centos7_latest + +version: + echo $(RUNTIMETAG) | tail -1 > version.txt + build: - docker build -t docker.io/stackstate/stackstate-agent-runner-gitlab:centos7_latest_v7 . + docker build --build-arg BASE_RUNNER_IMAGE_VERSION=$(BASE_RUNNER_IMAGE_VERSION) -t $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:centos7_$(RUNTIMETAG) . + push: - docker tag docker.io/stackstate/stackstate-agent-runner-gitlab:centos7_latest_v7 docker.io/stackstate/stackstate-agent-runner-gitlab:centos7_$(RUNTIMETAG)_v7_$(TRY) - docker tag docker.io/stackstate/stackstate-agent-runner-gitlab:centos7_latest_v7 docker.io/stackstate/stackstate-agent-runner-gitlab:centos7_$(RUNTIMETAG)_v7 - docker push docker.io/stackstate/stackstate-agent-runner-gitlab:centos7_latest_v7 - docker push docker.io/stackstate/stackstate-agent-runner-gitlab:centos7_$(RUNTIMETAG)_v7 - docker push docker.io/stackstate/stackstate-agent-runner-gitlab:centos7_$(RUNTIMETAG)_v7_$(TRY) + docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:centos7_$(RUNTIMETAG) diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index 22f462a6e1ce08..bb88481402b4cd 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -8,6 +8,7 @@ variables: RUNNER_DEB_RPM_PUBLISHER: $CI_PROJECT_DIR/.cd-builders/runner7-gitlab-deb-rpmpublisher RUNNER_CENTOS6_BASE: $CI_PROJECT_DIR/.cd-builders/runner7-circle-rpm RUNNER_CENTOS7_BASE: $CI_PROJECT_DIR/.cd-builders/runner7-circle-rpm7 + RUNNER_CENTOS7: $CI_PROJECT_DIR/.cd-builders/runner7-gitlab-rpm7 DOCKER_REGISTRY: docker.io QUAY_REGISTRY: quay.io DOCKER_DRIVER: overlay @@ -75,7 +76,7 @@ build-centos7-base: BASE_RUNNER_IMAGE_VERSION: "centos7" ################################################################################## -# BUILD IMAGES BASED ON DEB IMAGE BASE +# BUILD RUNNER IMAGES FROM BASE IMAGE ################################################################################# .docker_main_runner_build_base: &docker_main_runner_build_base @@ -98,7 +99,7 @@ build-centos7-base: # - docker push "${QUAY_TAG}" -# image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb7_{yyyymmdd} +# produces the runner deb image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb7_{yyyymmdd} build-main-deb-runner: <<: *docker_main_runner_build_base needs: [ build-deb-base ] @@ -107,8 +108,8 @@ build-main-deb-runner: RUNNER_IMAGE_VERSION: "deb7" BASE_RUNNER_IMAGE_VERSION: "deb7" -# image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_{yyyymmdd} -build-deb-rpm-publisher: +# produces the runner deb/rpm publisher image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_{yyyymmdd} +build-deb-rpm-publisher-runner: <<: *docker_main_runner_build_base needs: [ build-deb-base ] variables: @@ -116,7 +117,16 @@ build-deb-rpm-publisher: RUNNER_IMAGE_VERSION: "deb-rpmpublisher" BASE_RUNNER_IMAGE_VERSION: "deb7" -# image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7_20211004_v7_0 +# produces the runner centos 7 image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7_20211004_v7_0 +build-centos7-runner: + <<: *docker_main_runner_build_base + needs: [ build-centos7-base ] + variables: + RUNNER_DIR: $RUNNER_CENTOS7 + RUNNER_IMAGE_VERSION: "centos7" + BASE_RUNNER_IMAGE_VERSION: "centos7" -# image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos6_20190429 +# TODO: centos6 is EOL. This might potentially work: https://arstech.net/centos-6-error-yumrepo-error-all-mirror-urls-are-not-using-ftp-http/ +# TODO: skipping it for now +# produces the runner centos 6 image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos6_20190429 From b5a5168f97fc169e49f155215ce62112195f5a4e Mon Sep 17 00:00:00 2001 From: zandrewitte Date: Fri, 10 Dec 2021 15:27:36 +0200 Subject: [PATCH 25/81] point to newly release images, make the publish image manual trigger on master, minor cleanups --- .gitlab-ci-agent.yml | 12 ++-- .gitlab-ci-build-runners.yml | 4 +- .gitlab-ci-cluster-agent.yml | 2 +- .gitlab-ci.yml | 90 ++++++++++++++-------------- Development.md | 4 +- Dockerfiles/local_builder/Dockerfile | 2 +- 6 files changed, 58 insertions(+), 56 deletions(-) diff --git a/.gitlab-ci-agent.yml b/.gitlab-ci-agent.yml index 5e40dd35cdf2f4..bcb210270a29f9 100644 --- a/.gitlab-ci-agent.yml +++ b/.gitlab-ci-agent.yml @@ -1,4 +1,4 @@ -image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:latest7 +image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb7_20211210 stages: - manual_cleanup @@ -156,7 +156,7 @@ deps_deb: deps_rpm: stage: prepare interruptible: true - image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7_20211004_v7_0 + image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7_20211210 cache: key: "deps-rpm-$STS_VER-$CI_COMMIT_REF_SLUG" paths: @@ -407,7 +407,7 @@ build_deb: build_rpm: stage: build interruptible: true - image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7_20211004_v7_0 + image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7_20211210 needs: - deps_rpm tags: @@ -515,7 +515,7 @@ test_deb_renaming: test_rpm_renaming: stage: test interruptible: true - image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos6_20190429 + image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7_20211210 needs: - build_rpm before_script: [] @@ -583,7 +583,7 @@ pre_release_win: pre_release_rpm: stage: pre_release interruptible: true - image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher + image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_20211210 needs: - build_rpm before_script: [] @@ -1188,7 +1188,7 @@ release_deb: release_rpm: interruptible: true stage: release - image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher + image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_20211210 dependencies: - build_rpm before_script: diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index bb88481402b4cd..e5d652104cc0bb 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -29,8 +29,8 @@ before_script: retry: max: 2 when: - - runner_system_failure - - stuck_or_timeout_failure + # TODO: figure out what causes flakiness in the docker builds, sometimes pulling fails on builder the image or the base image is not available yet for the runner to pull + - always ################################################################################## # BUILD IMAGES BASE FOR DEB + RPM diff --git a/.gitlab-ci-cluster-agent.yml b/.gitlab-ci-cluster-agent.yml index bef3ad89961d4a..1abec33db687a7 100644 --- a/.gitlab-ci-cluster-agent.yml +++ b/.gitlab-ci-cluster-agent.yml @@ -4,7 +4,7 @@ #################################################################################################### #################################################################################################### -image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:latest7 +image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb7_20211210 stages: - prepare diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9ecf205845ac03..074836c87d4b9b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -99,49 +99,49 @@ variables: &commonvariables if: $CI_COMMIT_TAG =~ /3\..*/ when: never -#agent2: -# stage: triggers -# variables: -# <<: *commonvariables -# <<: *agent2_variables -# trigger: -# include: .gitlab-ci-agent.yml -# strategy: depend -# rules: -# - <<: *exclude_on_cluster_agent -# # exclude this pipeline if we're running a v3 tag pipeline -# - <<: *exclude_on_tag_v3 -# - if: $CI_COMMIT_MESSAGE =~ /\[py3]/ -# when: never -# - when: on_success -# -#agent3: -# stage: triggers -# variables: -# <<: *commonvariables -# <<: *agent3_variables -# trigger: -# include: .gitlab-ci-agent.yml -# strategy: depend -# rules: -# - <<: *exclude_on_cluster_agent -# # exclude this pipeline if we're running a v2 tag pipeline -# - <<: *exclude_on_tag_v2 -# - if: $CI_COMMIT_MESSAGE =~ /\[py2]/ -# when: never -# - when: on_success -# -#cluster_agent: -# stage: triggers -# variables: -# <<: *commonvariables -# <<: *agent3_variables -# trigger: -# include: .gitlab-ci-cluster-agent.yml -# strategy: depend -# rules: -# - <<: *include_on_cluster_agent -# - when: never +agent2: + stage: triggers + variables: + <<: *commonvariables + <<: *agent2_variables + trigger: + include: .gitlab-ci-agent.yml + strategy: depend + rules: + - <<: *exclude_on_cluster_agent + # exclude this pipeline if we're running a v3 tag pipeline + - <<: *exclude_on_tag_v3 + - if: $CI_COMMIT_MESSAGE =~ /\[py3]/ + when: never + - when: on_success + +agent3: + stage: triggers + variables: + <<: *commonvariables + <<: *agent3_variables + trigger: + include: .gitlab-ci-agent.yml + strategy: depend + rules: + - <<: *exclude_on_cluster_agent + # exclude this pipeline if we're running a v2 tag pipeline + - <<: *exclude_on_tag_v2 + - if: $CI_COMMIT_MESSAGE =~ /\[py2]/ + when: never + - when: on_success + +cluster_agent: + stage: triggers + variables: + <<: *commonvariables + <<: *agent3_variables + trigger: + include: .gitlab-ci-cluster-agent.yml + strategy: depend + rules: + - <<: *include_on_cluster_agent + - when: never build_runners: stage: triggers @@ -151,4 +151,6 @@ build_runners: include: .gitlab-ci-build-runners.yml strategy: depend rules: - - when: on_success + # make a manual job only on the master branch + - if: $CI_COMMIT_REF_NAME == "master" + when: manual diff --git a/Development.md b/Development.md index fcf99581358db6..2d0eea343116c6 100644 --- a/Development.md +++ b/Development.md @@ -2,7 +2,7 @@ Using our builder image clone and checkout the public repo and th <> you are interested of: ```bash -$ docker run --rm -ti artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:latest7 bash +$ docker run --rm -ti artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb7_20211210 bash $ export CI_PROJECT_DIR=/go/src/github.com/StackVista/stackstate-agent && \ mkdir -p /go/src/github.com/StackVista && \ @@ -44,7 +44,7 @@ $ conda activate ddpy2 && \ Instead of cloning the repo you could use directly your local one: ```bash -$ docker run --rm -it --name stackstate-agent-builder --mount type=bind,source="${PWD}",target=/root/stackstate-agent,readonly artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:latest7 bash +$ docker run --rm -it --name stackstate-agent-builder --mount type=bind,source="${PWD}",target=/root/stackstate-agent,readonly artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb7_20211210 bash $ export CI_PROJECT_DIR=/go/src/github.com/StackVista/stackstate-agent && \ mkdir -p /go/src/github.com/StackVista && \ diff --git a/Dockerfiles/local_builder/Dockerfile b/Dockerfiles/local_builder/Dockerfile index 9126f1ee03a2a4..e0f9b2a10164e1 100644 --- a/Dockerfiles/local_builder/Dockerfile +++ b/Dockerfiles/local_builder/Dockerfile @@ -1,4 +1,4 @@ -FROM artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:latest7 +FROM artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb7_20211210 COPY scripts/entry_point.sh /entry_point.sh COPY scripts/shell.sh /shell.sh From 7ac47d5f2b919b1c5e37d59b02b93d77157b7360 Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Wed, 15 Dec 2021 11:55:20 -0300 Subject: [PATCH 26/81] Use sts version of rpm-s3 --- .cd-builders/runner-circle-deb/Dockerfile | 2 +- .cd-builders/runner-circle-rpm/Dockerfile | 2 +- .cd-builders/runner-gitlab-deb/Dockerfile | 2 +- .cd-builders/runner-gitlab-rpm/Dockerfile | 2 +- .cd-builders/runner7-circle-deb/Dockerfile | 2 +- .cd-builders/runner7-circle-rpm7/Dockerfile | 2 +- .cd-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile | 2 +- .cd-builders/runner7-gitlab-deb/Dockerfile | 2 +- .cd-builders/runner7-gitlab-rpm/Dockerfile | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.cd-builders/runner-circle-deb/Dockerfile b/.cd-builders/runner-circle-deb/Dockerfile index 75a9461686714d..d5f0d05a38a1d0 100644 --- a/.cd-builders/runner-circle-deb/Dockerfile +++ b/.cd-builders/runner-circle-deb/Dockerfile @@ -94,5 +94,5 @@ RUN apt-get install -y apt-utils libtool && apt-get install -y --only-upgrade li # For some tests RUN apt-get install sudo -RUN pip install awscli boto3 sa-rpm-s3 +RUN pip install awscli boto3 sts-rpm-s3 RUN apt-get install -y libkrb5-dev unixodbc-dev rpm python-deltarpm createrepo yum-utils bison diff --git a/.cd-builders/runner-circle-rpm/Dockerfile b/.cd-builders/runner-circle-rpm/Dockerfile index 92158a5bcc517d..96a6bb3c192c80 100644 --- a/.cd-builders/runner-circle-rpm/Dockerfile +++ b/.cd-builders/runner-circle-rpm/Dockerfile @@ -91,6 +91,6 @@ RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ RUN git config --global user.email "gitlab@stackstate" && git config --global user.name "Gitlab Stackstate" -RUN pip install awscli boto3 sa-rpm-s3 +RUN pip install awscli boto3 sts-rpm-s3 RUN yum -y install net-snmp-devel python-deltarpm yum-utils libtool rpm-sign createrepo diff --git a/.cd-builders/runner-gitlab-deb/Dockerfile b/.cd-builders/runner-gitlab-deb/Dockerfile index c88e20eb2b009c..f715d1e86e0990 100644 --- a/.cd-builders/runner-gitlab-deb/Dockerfile +++ b/.cd-builders/runner-gitlab-deb/Dockerfile @@ -1,6 +1,6 @@ FROM docker.io/stackstate/stackstate-agent-runner-circle:latest -RUN pip install awscli boto3 sa-rpm-s3 +RUN pip install awscli boto3 sts-rpm-s3 #RUN apt-get install -y libkrb5-dev unixodbc-dev rpm python-deltarpm createrepo yum-utils ADD rpmmacros /root/.rpmmacros diff --git a/.cd-builders/runner-gitlab-rpm/Dockerfile b/.cd-builders/runner-gitlab-rpm/Dockerfile index 9b1b8c8816f740..49cbe0771f5739 100644 --- a/.cd-builders/runner-gitlab-rpm/Dockerfile +++ b/.cd-builders/runner-gitlab-rpm/Dockerfile @@ -1,6 +1,6 @@ FROM docker.io/stackstate/stackstate-agent-runner-circle:centos6 -RUN pip install awscli boto3 sa-rpm-s3 +RUN pip install awscli boto3 sts-rpm-s3 RUN yum -y install net-snmp-devel python-deltarpm yum-utils libtool rpm-sign createrepo diff --git a/.cd-builders/runner7-circle-deb/Dockerfile b/.cd-builders/runner7-circle-deb/Dockerfile index c51cf0c41742fa..5c60edfa30fdef 100644 --- a/.cd-builders/runner7-circle-deb/Dockerfile +++ b/.cd-builders/runner7-circle-deb/Dockerfile @@ -168,7 +168,7 @@ RUN apt-get install -y apt-utils libtool && apt-get install -y --only-upgrade li RUN apt-get install sudo # TODO: to be moved to conda virtualenvs -#RUN pip install awscli boto3 sa-rpm-s3 +#RUN pip install awscli boto3 sts-rpm-s3 ADD rpmmacros /root/.rpmmacros # yum-utils #https://pkgs.org/download/yum-utils #RUN apt-get install -y libkrb5-dev unixodbc-dev rpm python-deltarpm createrepo bison yum-utils diff --git a/.cd-builders/runner7-circle-rpm7/Dockerfile b/.cd-builders/runner7-circle-rpm7/Dockerfile index 83850f2f937285..5aea4172c8e59d 100644 --- a/.cd-builders/runner7-circle-rpm7/Dockerfile +++ b/.cd-builders/runner7-circle-rpm7/Dockerfile @@ -157,7 +157,7 @@ RUN mkdir -p /go/src/github.com/DataDog/datadog-agent # Force umask to 0022 RUN echo "umask 0022" >> /root/.bashrc -RUN pip install awscli boto3 sa-rpm-s3 +RUN pip install awscli boto3 sts-rpm-s3 RUN yum -y install net-snmp-devel python-deltarpm yum-utils libtool rpm-sign createrepo diff --git a/.cd-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile b/.cd-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile index 84a3bb2fe24762..2cfafcea71fe69 100644 --- a/.cd-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile +++ b/.cd-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile @@ -1,7 +1,7 @@ ARG BASE_RUNNER_IMAGE_VERSION=deb7_latest FROM docker.io/stackstate/stackstate-agent-runner-circle:${BASE_RUNNER_IMAGE_VERSION} -RUN pip install boto3 sa-rpm-s3 invoke distro==1.4.0 awscli==1.16 +RUN pip install boto3 sts-rpm-s3 invoke distro==1.4.0 awscli==1.16 RUN apt update && apt-get install -y libkrb5-dev unixodbc-dev rpm python-deltarpm createrepo yum-utils ADD rpmmacros /root/.rpmmacros diff --git a/.cd-builders/runner7-gitlab-deb/Dockerfile b/.cd-builders/runner7-gitlab-deb/Dockerfile index 266183bdb85fc8..6fe137c4aaa026 100644 --- a/.cd-builders/runner7-gitlab-deb/Dockerfile +++ b/.cd-builders/runner7-gitlab-deb/Dockerfile @@ -10,7 +10,7 @@ RUN echo 'gem: --no-document' >> /root/.gemrc RUN bash -c "source /usr/local/rvm/scripts/rvm && gem install deb-s3" -#RUN pip install awscli boto3 sa-rpm-s3 +#RUN pip install awscli boto3 sts-rpm-s3 ADD rpmmacros /root/.rpmmacros # yum-utils #https://pkgs.org/download/yum-utils #RUN apt-get install -y libkrb5-dev unixodbc-dev rpm python-deltarpm createrepo bison yum-utils diff --git a/.cd-builders/runner7-gitlab-rpm/Dockerfile b/.cd-builders/runner7-gitlab-rpm/Dockerfile index bf9122d4a96ae8..9955b952c0b779 100644 --- a/.cd-builders/runner7-gitlab-rpm/Dockerfile +++ b/.cd-builders/runner7-gitlab-rpm/Dockerfile @@ -32,7 +32,7 @@ RUN curl https://curl.se/ca/cacert.pem -o /etc/pki/tls/certs/ca-bundle.crt # /workaround -RUN pip install awscli boto3 sa-rpm-s3 +RUN pip install awscli boto3 sts-rpm-s3 RUN yum -y install net-snmp-devel python-deltarpm yum-utils libtool rpm-sign createrepo From fa627f0d13d3a90f2d978af9b1f7807dcf05d0d4 Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Wed, 15 Dec 2021 14:02:57 -0300 Subject: [PATCH 27/81] Add manual job to publish image --- .gitlab-ci-agent.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.gitlab-ci-agent.yml b/.gitlab-ci-agent.yml index 390510ce513fd8..570c1bf3372aba 100644 --- a/.gitlab-ci-agent.yml +++ b/.gitlab-ci-agent.yml @@ -214,6 +214,16 @@ deps_win: - runner_system_failure - stuck_or_timeout_failure +publish_rpmpublisher: + stage: prepare + before_script: [] + when: manual + tags: + - sts-k8s-m-runner + script: + - cd $CI_PROJECT_DIR/.cd-builders/runner7-gitlab-deb-rpmpublisher && make build + - cd $CI_PROJECT_DIR/.cd-builders/runner7-gitlab-deb-rpmpublisher && make push + ## build stage unit_tests: From bab0336aa0cf0471479093cbab1dfeaedd26f945 Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Wed, 15 Dec 2021 15:27:07 -0300 Subject: [PATCH 28/81] Use docker image --- .gitlab-ci-agent.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci-agent.yml b/.gitlab-ci-agent.yml index 570c1bf3372aba..61c129a2b9d5c7 100644 --- a/.gitlab-ci-agent.yml +++ b/.gitlab-ci-agent.yml @@ -218,6 +218,10 @@ publish_rpmpublisher: stage: prepare before_script: [] when: manual + image: artifactory.tooling.stackstate.io/docker-virtual/docker:18.06.0 + services: + - name: artifactory.tooling.stackstate.io/docker-virtual/docker:18.09-dind + alias: docker tags: - sts-k8s-m-runner script: From 02d61b57f58d61312a5619fa7dd6bb46c67d1c4f Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Wed, 15 Dec 2021 15:48:27 -0300 Subject: [PATCH 29/81] Install make before build and push --- .gitlab-ci-agent.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci-agent.yml b/.gitlab-ci-agent.yml index 61c129a2b9d5c7..07ecd7bf00658f 100644 --- a/.gitlab-ci-agent.yml +++ b/.gitlab-ci-agent.yml @@ -225,6 +225,7 @@ publish_rpmpublisher: tags: - sts-k8s-m-runner script: + - apk add --update alpine-sdk - cd $CI_PROJECT_DIR/.cd-builders/runner7-gitlab-deb-rpmpublisher && make build - cd $CI_PROJECT_DIR/.cd-builders/runner7-gitlab-deb-rpmpublisher && make push From b19ae8ba36e718f4cf788fa6cbb97906e75d3345 Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Wed, 15 Dec 2021 16:50:48 -0300 Subject: [PATCH 30/81] Allow to publish runner --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 074836c87d4b9b..a56459b56d6e88 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -150,7 +150,7 @@ build_runners: trigger: include: .gitlab-ci-build-runners.yml strategy: depend - rules: - # make a manual job only on the master branch - - if: $CI_COMMIT_REF_NAME == "master" - when: manual +# rules: +# # make a manual job only on the master branch +# - if: $CI_COMMIT_REF_NAME == "master" +# when: manual From b09080bba1d96c5a8723221fd012e751ffb1a9d4 Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Wed, 15 Dec 2021 16:59:59 -0300 Subject: [PATCH 31/81] Enable [build_runners] --- .gitlab-ci.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a56459b56d6e88..3b8eaa1735a1c4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -150,7 +150,9 @@ build_runners: trigger: include: .gitlab-ci-build-runners.yml strategy: depend -# rules: -# # make a manual job only on the master branch -# - if: $CI_COMMIT_REF_NAME == "master" -# when: manual + rules: + # make a manual job only on the master branch + - if: $CI_COMMIT_REF_NAME == "master" + when: manual + - if: $CI_COMMIT_MESSAGE =~ /\[build_runners]/ + when: manual From c02acc14c3b1a29e55a570b5d76f7ad5008788c1 Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Wed, 15 Dec 2021 17:18:35 -0300 Subject: [PATCH 32/81] Update rpmpublisher image --- .gitlab-ci-agent.yml | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/.gitlab-ci-agent.yml b/.gitlab-ci-agent.yml index 07ecd7bf00658f..900cbc147e7ff1 100644 --- a/.gitlab-ci-agent.yml +++ b/.gitlab-ci-agent.yml @@ -214,21 +214,6 @@ deps_win: - runner_system_failure - stuck_or_timeout_failure -publish_rpmpublisher: - stage: prepare - before_script: [] - when: manual - image: artifactory.tooling.stackstate.io/docker-virtual/docker:18.06.0 - services: - - name: artifactory.tooling.stackstate.io/docker-virtual/docker:18.09-dind - alias: docker - tags: - - sts-k8s-m-runner - script: - - apk add --update alpine-sdk - - cd $CI_PROJECT_DIR/.cd-builders/runner7-gitlab-deb-rpmpublisher && make build - - cd $CI_PROJECT_DIR/.cd-builders/runner7-gitlab-deb-rpmpublisher && make push - ## build stage unit_tests: @@ -576,7 +561,7 @@ pre_release_win: pre_release_rpm: stage: pre_release interruptible: true - image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_20211210 + image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_20211215 needs: - build_rpm before_script: [] @@ -1180,7 +1165,7 @@ release_deb: release_rpm: interruptible: true stage: release - image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_20211210 + image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_20211215 dependencies: - build_rpm before_script: From 601d4900195ebd3f7787c229906bbd3e9231a5eb Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Thu, 16 Dec 2021 08:55:18 -0300 Subject: [PATCH 33/81] Update to rpm image to deb-rpmpublisher_20211216 --- .gitlab-ci-agent.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci-agent.yml b/.gitlab-ci-agent.yml index 900cbc147e7ff1..e4c8d42fc5445b 100644 --- a/.gitlab-ci-agent.yml +++ b/.gitlab-ci-agent.yml @@ -561,7 +561,7 @@ pre_release_win: pre_release_rpm: stage: pre_release interruptible: true - image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_20211215 + image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_20211216 needs: - build_rpm before_script: [] @@ -1165,7 +1165,7 @@ release_deb: release_rpm: interruptible: true stage: release - image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_20211215 + image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_20211216 dependencies: - build_rpm before_script: From ae02aaede53a77dc6344f61f14e879bb1d02fee5 Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Thu, 16 Dec 2021 16:32:54 -0300 Subject: [PATCH 34/81] Set sts-rpm-s3 to 0.3.3 [build_runners] --- .cd-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cd-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile b/.cd-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile index 2cfafcea71fe69..e121eabbe5ca44 100644 --- a/.cd-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile +++ b/.cd-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile @@ -1,7 +1,7 @@ ARG BASE_RUNNER_IMAGE_VERSION=deb7_latest FROM docker.io/stackstate/stackstate-agent-runner-circle:${BASE_RUNNER_IMAGE_VERSION} -RUN pip install boto3 sts-rpm-s3 invoke distro==1.4.0 awscli==1.16 +RUN pip install boto3 sts-rpm-s3==0.3.3 invoke distro==1.4.0 awscli==1.16 RUN apt update && apt-get install -y libkrb5-dev unixodbc-dev rpm python-deltarpm createrepo yum-utils ADD rpmmacros /root/.rpmmacros From 8564d72f9cf70a6bc05b49c5ca1991333d77d662 Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Fri, 17 Dec 2021 09:33:24 -0300 Subject: [PATCH 35/81] Fix molecule kubernetes test --- .gitlab-ci-agent.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci-agent.yml b/.gitlab-ci-agent.yml index e4c8d42fc5445b..0a4e6ecdfde83e 100644 --- a/.gitlab-ci-agent.yml +++ b/.gitlab-ci-agent.yml @@ -561,7 +561,7 @@ pre_release_win: pre_release_rpm: stage: pre_release interruptible: true - image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_20211216 + image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_20211217 needs: - build_rpm before_script: [] @@ -1165,7 +1165,7 @@ release_deb: release_rpm: interruptible: true stage: release - image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_20211216 + image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_20211217 dependencies: - build_rpm before_script: From a4f16420fb13f661d4b83f221496573b1135785d Mon Sep 17 00:00:00 2001 From: Zandre Witte Date: Wed, 5 Jan 2022 09:58:42 +0100 Subject: [PATCH 36/81] test commit Signed-off-by: Zandre Witte --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4f36a10f52dbac..940aabfeb6b9fe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,6 +31,7 @@ stages: # You can also reduce the costs by running no molecule tests # - " [molecule-none]" +# test commit variables: &commonvariables # The SRC_PATH is in the GOPATH of the builders which From 038e793693c977f4ba97b31478c8a583e93cddb3 Mon Sep 17 00:00:00 2001 From: Zandre Witte Date: Wed, 5 Jan 2022 15:46:00 +0100 Subject: [PATCH 37/81] remove test commit --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 940aabfeb6b9fe..4f36a10f52dbac 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,7 +31,6 @@ stages: # You can also reduce the costs by running no molecule tests # - " [molecule-none]" -# test commit variables: &commonvariables # The SRC_PATH is in the GOPATH of the builders which From 4bbb6e43b5d6aa9c51dd817d9d915d495af5e178 Mon Sep 17 00:00:00 2001 From: Zandre Witte Date: Fri, 7 Jan 2022 10:47:00 +0100 Subject: [PATCH 38/81] build runner for deb_rpm publisher using Py2 instead of Py3 [build_runners] --- .../Dockerfile | 3 +++ .../entrypoint.sh | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 .cd-builders/runner7-gitlab-deb-rpmpublisher/entrypoint.sh diff --git a/.cd-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile b/.cd-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile index e121eabbe5ca44..f50cbbcd63ccac 100644 --- a/.cd-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile +++ b/.cd-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile @@ -5,3 +5,6 @@ RUN pip install boto3 sts-rpm-s3==0.3.3 invoke distro==1.4.0 awscli==1.16 RUN apt update && apt-get install -y libkrb5-dev unixodbc-dev rpm python-deltarpm createrepo yum-utils ADD rpmmacros /root/.rpmmacros + +# TODO: Get rid of entrypoint that runs this image with python V2. Investigate if createrepo can work with Py3 +ENTRYPOINT ["/entrypoint.sh"] diff --git a/.cd-builders/runner7-gitlab-deb-rpmpublisher/entrypoint.sh b/.cd-builders/runner7-gitlab-deb-rpmpublisher/entrypoint.sh new file mode 100644 index 00000000000000..cf17c3d71acccb --- /dev/null +++ b/.cd-builders/runner7-gitlab-deb-rpmpublisher/entrypoint.sh @@ -0,0 +1,19 @@ +#!/bin/bash -l +set -e + +source /root/.bashrc + +if command -v conda; then + # Only try to use conda if it's installed. + # On ARM images, we use the system Python 3 because conda is not supported. + conda activate ddpy2 +fi + +#if [ "$DD_TARGET_ARCH" = "arm64v8" ] ; then +# export GIMME_ARCH=arm64 +#elif [ "$DD_TARGET_ARCH" = "arm32v7" ] ; then +# export GIMME_ARCH=arm +#fi +#eval "$(gimme)" + +exec "$@" From fe01a566268e9b061b569f1b4398c6cd49a9f971 Mon Sep 17 00:00:00 2001 From: Zandre Witte Date: Fri, 7 Jan 2022 12:41:04 +0100 Subject: [PATCH 39/81] switch runner --- .gitlab-ci-agent.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci-agent.yml b/.gitlab-ci-agent.yml index 0a4e6ecdfde83e..898a23207de009 100644 --- a/.gitlab-ci-agent.yml +++ b/.gitlab-ci-agent.yml @@ -561,7 +561,7 @@ pre_release_win: pre_release_rpm: stage: pre_release interruptible: true - image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_20211217 + image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_20220107 needs: - build_rpm before_script: [] @@ -1165,7 +1165,7 @@ release_deb: release_rpm: interruptible: true stage: release - image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_20211217 + image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_20220107 dependencies: - build_rpm before_script: From d01b2d08a22a17989396ff133ee3e9b1fb1c682e Mon Sep 17 00:00:00 2001 From: Zandre Witte Date: Wed, 19 Jan 2022 10:24:37 +0100 Subject: [PATCH 40/81] build publisher base, use publisher base when building deb-rpm publisher --- .cd-builders/runner-circle-deb/Makefile | 9 +++++---- .../runner7-gitlab-deb-rpmpublisher/Makefile | 2 +- .gitlab-ci-build-runners.yml | 12 ++++++++++-- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.cd-builders/runner-circle-deb/Makefile b/.cd-builders/runner-circle-deb/Makefile index 5649ddcf72c7ab..c99c69c2f8e63d 100644 --- a/.cd-builders/runner-circle-deb/Makefile +++ b/.cd-builders/runner-circle-deb/Makefile @@ -1,12 +1,13 @@ RUNTIMETAG := $(shell date +%Y%m%d) +DOCKER_REPOSITORY ?= docker.io build: - docker build -t docker.io/stackstate/stackstate-agent-runner-circle:deb_$(RUNTIMETAG) . + docker build -t $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:deb_$(RUNTIMETAG) . push: - docker push docker.io/stackstate/stackstate-agent-runner-circle:deb_$(RUNTIMETAG) + docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:deb_$(RUNTIMETAG) tag_latest: - docker tag docker.io/stackstate/stackstate-agent-runner-circle:deb_$(RUNTIMETAG) docker.io/stackstate/stackstate-agent-runner-circle:deb_latest + docker tag $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:deb_$(RUNTIMETAG) $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:deb_latest push_latest: - docker push docker.io/stackstate/stackstate-agent-runner-circle:deb_latest + docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:deb_latest diff --git a/.cd-builders/runner7-gitlab-deb-rpmpublisher/Makefile b/.cd-builders/runner7-gitlab-deb-rpmpublisher/Makefile index e12da2ad1b3be4..eaaf4b339b74af 100644 --- a/.cd-builders/runner7-gitlab-deb-rpmpublisher/Makefile +++ b/.cd-builders/runner7-gitlab-deb-rpmpublisher/Makefile @@ -1,6 +1,6 @@ RUNTIMETAG := $(shell date +%Y%m%d) DOCKER_REPOSITORY ?= docker.io -BASE_RUNNER_IMAGE_VERSION ?= deb7_latest +BASE_RUNNER_IMAGE_VERSION ?= publisher_latest build: docker build --build-arg BASE_RUNNER_IMAGE_VERSION=$(BASE_RUNNER_IMAGE_VERSION) -t $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_$(RUNTIMETAG) . diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index e5d652104cc0bb..bf1470e8f35ebe 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -5,6 +5,7 @@ stages: variables: RUNNER_DEB_BASE: $CI_PROJECT_DIR/.cd-builders/runner7-circle-deb RUNNER_DEB: $CI_PROJECT_DIR/.cd-builders/runner7-gitlab-deb + RUNNER_PUBLISHER_BASE: $CI_PROJECT_DIR/.cd-builders/runner7-circle-deb RUNNER_DEB_RPM_PUBLISHER: $CI_PROJECT_DIR/.cd-builders/runner7-gitlab-deb-rpmpublisher RUNNER_CENTOS6_BASE: $CI_PROJECT_DIR/.cd-builders/runner7-circle-rpm RUNNER_CENTOS7_BASE: $CI_PROJECT_DIR/.cd-builders/runner7-circle-rpm7 @@ -52,6 +53,13 @@ before_script: # - docker tag "${BUILD_TAG}" "${DOCKER_TAG}" # - docker push "${QUAY_TAG}" +# produces the base deb image: quay.io/stackstate/stackstate-agent-runner-circle:publisher_{yyyymmdd} +build-publisher-base: + <<: *docker_build_runner_base + variables: + RUNNER_DIR: $RUNNER_PUBLISHER_BASE + BASE_RUNNER_IMAGE_VERSION: "publisher" + # produces the base deb image: quay.io/stackstate/stackstate-agent-runner-circle:deb7_{yyyymmdd} build-deb-base: <<: *docker_build_runner_base @@ -111,11 +119,11 @@ build-main-deb-runner: # produces the runner deb/rpm publisher image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_{yyyymmdd} build-deb-rpm-publisher-runner: <<: *docker_main_runner_build_base - needs: [ build-deb-base ] + needs: [ build-publisher-base ] variables: RUNNER_DIR: $RUNNER_DEB_RPM_PUBLISHER RUNNER_IMAGE_VERSION: "deb-rpmpublisher" - BASE_RUNNER_IMAGE_VERSION: "deb7" + BASE_RUNNER_IMAGE_VERSION: "publisher" # produces the runner centos 7 image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7_20211004_v7_0 build-centos7-runner: From b6f5a96fd03f81b2b0f649c2f7bf28ff3ccdd3e3 Mon Sep 17 00:00:00 2001 From: Zandre Witte Date: Wed, 19 Jan 2022 10:30:04 +0100 Subject: [PATCH 41/81] [build_runners] documentation --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 487992c77dfea2..a864c07f700c04 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -157,5 +157,6 @@ build_runners: # make a manual job only on the master branch - if: $CI_COMMIT_REF_NAME == "master" when: manual + # make a manual job when the commit message includes [build_runners] - if: $CI_COMMIT_MESSAGE =~ /\[build_runners]/ when: manual From 6521ee5b8ccb0180e4c3e8918f81ac242d1ee71e Mon Sep 17 00:00:00 2001 From: Zandre Witte Date: Wed, 19 Jan 2022 11:10:57 +0100 Subject: [PATCH 42/81] get rid of entrypoint in deb-rpm publisher image --- .../Dockerfile | 5 +---- .../entrypoint.sh | 19 ------------------- 2 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 .cd-builders/runner7-gitlab-deb-rpmpublisher/entrypoint.sh diff --git a/.cd-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile b/.cd-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile index f50cbbcd63ccac..6a94d08f9167a9 100644 --- a/.cd-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile +++ b/.cd-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile @@ -1,10 +1,7 @@ -ARG BASE_RUNNER_IMAGE_VERSION=deb7_latest +ARG BASE_RUNNER_IMAGE_VERSION=publisher_latest FROM docker.io/stackstate/stackstate-agent-runner-circle:${BASE_RUNNER_IMAGE_VERSION} RUN pip install boto3 sts-rpm-s3==0.3.3 invoke distro==1.4.0 awscli==1.16 RUN apt update && apt-get install -y libkrb5-dev unixodbc-dev rpm python-deltarpm createrepo yum-utils ADD rpmmacros /root/.rpmmacros - -# TODO: Get rid of entrypoint that runs this image with python V2. Investigate if createrepo can work with Py3 -ENTRYPOINT ["/entrypoint.sh"] diff --git a/.cd-builders/runner7-gitlab-deb-rpmpublisher/entrypoint.sh b/.cd-builders/runner7-gitlab-deb-rpmpublisher/entrypoint.sh deleted file mode 100644 index cf17c3d71acccb..00000000000000 --- a/.cd-builders/runner7-gitlab-deb-rpmpublisher/entrypoint.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -l -set -e - -source /root/.bashrc - -if command -v conda; then - # Only try to use conda if it's installed. - # On ARM images, we use the system Python 3 because conda is not supported. - conda activate ddpy2 -fi - -#if [ "$DD_TARGET_ARCH" = "arm64v8" ] ; then -# export GIMME_ARCH=arm64 -#elif [ "$DD_TARGET_ARCH" = "arm32v7" ] ; then -# export GIMME_ARCH=arm -#fi -#eval "$(gimme)" - -exec "$@" From 8b6492aa69de92d3122d864e0a728a21c116534d Mon Sep 17 00:00:00 2001 From: Zandre Witte Date: Wed, 19 Jan 2022 11:14:06 +0100 Subject: [PATCH 43/81] fix runner publisher base dir [build_runners] --- .gitlab-ci-build-runners.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index bf1470e8f35ebe..66af05bb8668ab 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -5,7 +5,7 @@ stages: variables: RUNNER_DEB_BASE: $CI_PROJECT_DIR/.cd-builders/runner7-circle-deb RUNNER_DEB: $CI_PROJECT_DIR/.cd-builders/runner7-gitlab-deb - RUNNER_PUBLISHER_BASE: $CI_PROJECT_DIR/.cd-builders/runner7-circle-deb + RUNNER_PUBLISHER_BASE: $CI_PROJECT_DIR/.cd-builders/runner-circle-deb RUNNER_DEB_RPM_PUBLISHER: $CI_PROJECT_DIR/.cd-builders/runner7-gitlab-deb-rpmpublisher RUNNER_CENTOS6_BASE: $CI_PROJECT_DIR/.cd-builders/runner7-circle-rpm RUNNER_CENTOS7_BASE: $CI_PROJECT_DIR/.cd-builders/runner7-circle-rpm7 From 55e97edd6931cd6f08f08a2be7e8404e219e9723 Mon Sep 17 00:00:00 2001 From: Zandre Witte Date: Wed, 19 Jan 2022 14:42:50 +0100 Subject: [PATCH 44/81] try using deb7_latest for deb-rpm publisher --- .../Dockerfile | 2 +- .../runner7-gitlab-deb-rpmpublisher/Makefile | 2 +- .../entrypoint.sh | 19 +++++++++++++++++++ .gitlab-ci-build-runners.yml | 12 ++---------- 4 files changed, 23 insertions(+), 12 deletions(-) create mode 100644 .cd-builders/runner7-gitlab-deb-rpmpublisher/entrypoint.sh diff --git a/.cd-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile b/.cd-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile index 6a94d08f9167a9..e121eabbe5ca44 100644 --- a/.cd-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile +++ b/.cd-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_RUNNER_IMAGE_VERSION=publisher_latest +ARG BASE_RUNNER_IMAGE_VERSION=deb7_latest FROM docker.io/stackstate/stackstate-agent-runner-circle:${BASE_RUNNER_IMAGE_VERSION} RUN pip install boto3 sts-rpm-s3==0.3.3 invoke distro==1.4.0 awscli==1.16 diff --git a/.cd-builders/runner7-gitlab-deb-rpmpublisher/Makefile b/.cd-builders/runner7-gitlab-deb-rpmpublisher/Makefile index eaaf4b339b74af..e12da2ad1b3be4 100644 --- a/.cd-builders/runner7-gitlab-deb-rpmpublisher/Makefile +++ b/.cd-builders/runner7-gitlab-deb-rpmpublisher/Makefile @@ -1,6 +1,6 @@ RUNTIMETAG := $(shell date +%Y%m%d) DOCKER_REPOSITORY ?= docker.io -BASE_RUNNER_IMAGE_VERSION ?= publisher_latest +BASE_RUNNER_IMAGE_VERSION ?= deb7_latest build: docker build --build-arg BASE_RUNNER_IMAGE_VERSION=$(BASE_RUNNER_IMAGE_VERSION) -t $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_$(RUNTIMETAG) . diff --git a/.cd-builders/runner7-gitlab-deb-rpmpublisher/entrypoint.sh b/.cd-builders/runner7-gitlab-deb-rpmpublisher/entrypoint.sh new file mode 100644 index 00000000000000..8f2178732098b0 --- /dev/null +++ b/.cd-builders/runner7-gitlab-deb-rpmpublisher/entrypoint.sh @@ -0,0 +1,19 @@ +#!/bin/bash -l +set -e + +source /root/.bashrc + +if command -v conda; then + # Only try to use conda if it's installed. + # On ARM images, we use the system Python 3 because conda is not supported. + conda deactivate +fi + +#if [ "$DD_TARGET_ARCH" = "arm64v8" ] ; then +# export GIMME_ARCH=arm64 +#elif [ "$DD_TARGET_ARCH" = "arm32v7" ] ; then +# export GIMME_ARCH=arm +#fi +#eval "$(gimme)" + +exec "$@" diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index 66af05bb8668ab..e5d652104cc0bb 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -5,7 +5,6 @@ stages: variables: RUNNER_DEB_BASE: $CI_PROJECT_DIR/.cd-builders/runner7-circle-deb RUNNER_DEB: $CI_PROJECT_DIR/.cd-builders/runner7-gitlab-deb - RUNNER_PUBLISHER_BASE: $CI_PROJECT_DIR/.cd-builders/runner-circle-deb RUNNER_DEB_RPM_PUBLISHER: $CI_PROJECT_DIR/.cd-builders/runner7-gitlab-deb-rpmpublisher RUNNER_CENTOS6_BASE: $CI_PROJECT_DIR/.cd-builders/runner7-circle-rpm RUNNER_CENTOS7_BASE: $CI_PROJECT_DIR/.cd-builders/runner7-circle-rpm7 @@ -53,13 +52,6 @@ before_script: # - docker tag "${BUILD_TAG}" "${DOCKER_TAG}" # - docker push "${QUAY_TAG}" -# produces the base deb image: quay.io/stackstate/stackstate-agent-runner-circle:publisher_{yyyymmdd} -build-publisher-base: - <<: *docker_build_runner_base - variables: - RUNNER_DIR: $RUNNER_PUBLISHER_BASE - BASE_RUNNER_IMAGE_VERSION: "publisher" - # produces the base deb image: quay.io/stackstate/stackstate-agent-runner-circle:deb7_{yyyymmdd} build-deb-base: <<: *docker_build_runner_base @@ -119,11 +111,11 @@ build-main-deb-runner: # produces the runner deb/rpm publisher image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_{yyyymmdd} build-deb-rpm-publisher-runner: <<: *docker_main_runner_build_base - needs: [ build-publisher-base ] + needs: [ build-deb-base ] variables: RUNNER_DIR: $RUNNER_DEB_RPM_PUBLISHER RUNNER_IMAGE_VERSION: "deb-rpmpublisher" - BASE_RUNNER_IMAGE_VERSION: "publisher" + BASE_RUNNER_IMAGE_VERSION: "deb7" # produces the runner centos 7 image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7_20211004_v7_0 build-centos7-runner: From 38b25b83381e3b6dda2ba8e849ad0534e0f8741c Mon Sep 17 00:00:00 2001 From: Zandre Witte Date: Wed, 19 Jan 2022 21:55:30 +0100 Subject: [PATCH 45/81] test new commit --- .gitlab-ci-build-runners.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index e5d652104cc0bb..4967d213aa5302 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -130,3 +130,5 @@ build-centos7-runner: # TODO: skipping it for now # produces the runner centos 6 image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos6_20190429 + +# TEST From 6beb78d6533a0c1d66eb041d4118762dcb3bd59d Mon Sep 17 00:00:00 2001 From: Zandre Witte Date: Thu, 20 Jan 2022 14:06:59 +0100 Subject: [PATCH 46/81] revert test commit and [build_runners] --- .gitlab-ci-build-runners.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index 4967d213aa5302..65760fb03c7fb0 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -129,6 +129,3 @@ build-centos7-runner: # TODO: centos6 is EOL. This might potentially work: https://arstech.net/centos-6-error-yumrepo-error-all-mirror-urls-are-not-using-ftp-http/ # TODO: skipping it for now # produces the runner centos 6 image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos6_20190429 - - -# TEST From 46f1dac655d78d5b2cdea505187d994a3b43745e Mon Sep 17 00:00:00 2001 From: Zandre Witte Date: Thu, 20 Jan 2022 14:08:33 +0100 Subject: [PATCH 47/81] add entrypoint to deactivate conda [build_runners] --- .cd-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.cd-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile b/.cd-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile index e121eabbe5ca44..fcd6c1ae5d3103 100644 --- a/.cd-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile +++ b/.cd-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile @@ -5,3 +5,5 @@ RUN pip install boto3 sts-rpm-s3==0.3.3 invoke distro==1.4.0 awscli==1.16 RUN apt update && apt-get install -y libkrb5-dev unixodbc-dev rpm python-deltarpm createrepo yum-utils ADD rpmmacros /root/.rpmmacros + +ENTRYPOINT ["/entrypoint.sh"] From c12d57311ff04a29b5b21595babe33663a560a5e Mon Sep 17 00:00:00 2001 From: Zandre Witte Date: Thu, 20 Jan 2022 16:14:32 +0100 Subject: [PATCH 48/81] copy entrypoint script [build_runners] --- .cd-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.cd-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile b/.cd-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile index fcd6c1ae5d3103..90cbcc101ec150 100644 --- a/.cd-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile +++ b/.cd-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile @@ -6,4 +6,8 @@ RUN apt update && apt-get install -y libkrb5-dev unixodbc-dev rpm python-deltar ADD rpmmacros /root/.rpmmacros +# Entrypoint +COPY ./entrypoint.sh / +RUN chmod +x /entrypoint.sh + ENTRYPOINT ["/entrypoint.sh"] From 00fb4cca95e3b37f34bd65fd1dfd1176c8fc7f02 Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Tue, 3 May 2022 12:32:27 +0200 Subject: [PATCH 49/81] STAC-15134 trigger agent runners build [build_runners] --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d19222bd16c473..3415e8024ed10a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -156,7 +156,7 @@ cluster_agent: - <<: *include_on_cluster_agent - when: never -build_runners: +build_beest_runners: stage: triggers trigger: include: .gitlab-ci-builders.yml @@ -167,7 +167,7 @@ build_runners: when: never - if: $CI_COMMIT_BRANCH -build_runners_2: +build_agent_runners: stage: triggers variables: <<: *commonvariables From 0e691f896236f71bde3cfc8861ce619908076535 Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Tue, 3 May 2022 12:49:11 +0200 Subject: [PATCH 50/81] STAC-15134 trigger build_agent_runners --- .gitlab-ci.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3415e8024ed10a..158920a27b0dda 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -175,9 +175,7 @@ build_agent_runners: include: .gitlab-ci-build-runners.yml strategy: depend rules: - # make a manual job only on the master branch - - if: $CI_COMMIT_REF_NAME == "master" - when: manual - # make a manual job when the commit message includes [build_runners] - - if: $CI_COMMIT_MESSAGE =~ /\[build_runners]/ - when: manual + - if: $CI_MERGE_REQUEST_IID + - if: $CI_OPEN_MERGE_REQUESTS + when: never + - if: $CI_COMMIT_BRANCH From 0664eabc6ede654b7f82cd02fdb234f886dd788d Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Tue, 3 May 2022 12:58:15 +0200 Subject: [PATCH 51/81] STAC-15134 Attempt to fix build_agent_runners --- .gitlab-ci-build-runners.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index 65760fb03c7fb0..7da6f2c40e19c2 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -1,6 +1,7 @@ stages: - build_runner_base - build_runners + - fallback-manual variables: RUNNER_DEB_BASE: $CI_PROJECT_DIR/.cd-builders/runner7-circle-deb @@ -129,3 +130,16 @@ build-centos7-runner: # TODO: centos6 is EOL. This might potentially work: https://arstech.net/centos-6-error-yumrepo-error-all-mirror-urls-are-not-using-ftp-http/ # TODO: skipping it for now # produces the runner centos 6 image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos6_20190429 + +# This ensures that triggers can achieve success status if manual jobs are not executed. +ensure-success-manual: + stage: fallback-manual + before_script: [] + dependencies: + - build-main-deb-runner + script: + - echo "I will succeed" + rules: + - when: on_success + retry: + max: 2 From 88162c90edc3070619855f00c041906f0babff43 Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Tue, 3 May 2022 13:03:39 +0200 Subject: [PATCH 52/81] STAC-15134 Add stage to build-deb-base --- .gitlab-ci-build-runners.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index 7da6f2c40e19c2..a0fe1c945aaaee 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -56,6 +56,7 @@ before_script: # produces the base deb image: quay.io/stackstate/stackstate-agent-runner-circle:deb7_{yyyymmdd} build-deb-base: <<: *docker_build_runner_base + stage: build_runner_base variables: RUNNER_DIR: $RUNNER_DEB_BASE BASE_RUNNER_IMAGE_VERSION: "deb7" From ea818c69953e5c9d01eeeb111072e249eee186e3 Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Tue, 3 May 2022 16:06:49 +0200 Subject: [PATCH 53/81] STAC-15134 Run build_runner_base --- .gitlab-ci-build-runners.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index a0fe1c945aaaee..581e3fdc5d5f37 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -1,7 +1,6 @@ stages: - build_runner_base - build_runners - - fallback-manual variables: RUNNER_DEB_BASE: $CI_PROJECT_DIR/.cd-builders/runner7-circle-deb @@ -134,10 +133,8 @@ build-centos7-runner: # This ensures that triggers can achieve success status if manual jobs are not executed. ensure-success-manual: - stage: fallback-manual + stage: build_runner_base before_script: [] - dependencies: - - build-main-deb-runner script: - echo "I will succeed" rules: From db926d2681b0fa108239d3f866d49299aa03d4cb Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Tue, 3 May 2022 16:18:08 +0200 Subject: [PATCH 54/81] STAC-15134 Add rules to docker_build_base --- .gitlab-ci-build-runners.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index 581e3fdc5d5f37..5eefa462208484 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -31,6 +31,12 @@ before_script: when: # TODO: figure out what causes flakiness in the docker builds, sometimes pulling fails on builder the image or the base image is not available yet for the runner to pull - always + rules: + - if: $CI_COMMIT_MESSAGE =~ /\[build_runners]/ + when: always + - if: $CI_COMMIT_MESSAGE + when: manual + allow_failure: true ################################################################################## # BUILD IMAGES BASE FOR DEB + RPM From dbb43d94bf624d2c7afa17827d859a981e9fbc1d Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Tue, 3 May 2022 16:41:14 +0200 Subject: [PATCH 55/81] STAC-15134 Fix builders folder path --- .gitlab-ci-build-runners.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index 5eefa462208484..6e11d7051465d3 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -3,12 +3,13 @@ stages: - build_runners variables: - RUNNER_DEB_BASE: $CI_PROJECT_DIR/.cd-builders/runner7-circle-deb - RUNNER_DEB: $CI_PROJECT_DIR/.cd-builders/runner7-gitlab-deb - RUNNER_DEB_RPM_PUBLISHER: $CI_PROJECT_DIR/.cd-builders/runner7-gitlab-deb-rpmpublisher - RUNNER_CENTOS6_BASE: $CI_PROJECT_DIR/.cd-builders/runner7-circle-rpm - RUNNER_CENTOS7_BASE: $CI_PROJECT_DIR/.cd-builders/runner7-circle-rpm7 - RUNNER_CENTOS7: $CI_PROJECT_DIR/.cd-builders/runner7-gitlab-rpm7 + BUILDERS_FOLDER: CI_PROJECT_DIR/.ci-builders + RUNNER_DEB_BASE: $BUILDERS_FOLDER/runner7-circle-deb + RUNNER_DEB: $BUILDERS_FOLDER/runner7-gitlab-deb + RUNNER_DEB_RPM_PUBLISHER: $BUILDERS_FOLDER/runner7-gitlab-deb-rpmpublisher + RUNNER_CENTOS6_BASE: $BUILDERS_FOLDER/runner7-circle-rpm + RUNNER_CENTOS7_BASE: $BUILDERS_FOLDER/runner7-circle-rpm7 + RUNNER_CENTOS7: $BUILDERS_FOLDER/runner7-gitlab-rpm7 DOCKER_REGISTRY: docker.io QUAY_REGISTRY: quay.io DOCKER_DRIVER: overlay From cadc690360405da4afd88a945a16b2eaed1f7d3d Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Tue, 3 May 2022 16:48:40 +0200 Subject: [PATCH 56/81] STAC-15134 Fix builders folder path [2] --- .gitlab-ci-build-runners.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index 6e11d7051465d3..7d108dc090cb83 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -3,7 +3,7 @@ stages: - build_runners variables: - BUILDERS_FOLDER: CI_PROJECT_DIR/.ci-builders + BUILDERS_FOLDER: $CI_PROJECT_DIR/.ci-builders RUNNER_DEB_BASE: $BUILDERS_FOLDER/runner7-circle-deb RUNNER_DEB: $BUILDERS_FOLDER/runner7-gitlab-deb RUNNER_DEB_RPM_PUBLISHER: $BUILDERS_FOLDER/runner7-gitlab-deb-rpmpublisher From 3252b92c7424bdfaa19915d2974172f7527a24ce Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Wed, 4 May 2022 10:06:11 +0200 Subject: [PATCH 57/81] STAC-15134 Fix rvm gpg keys --- .ci-builders/runner7-circle-rpm7/Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.ci-builders/runner7-circle-rpm7/Dockerfile b/.ci-builders/runner7-circle-rpm7/Dockerfile index 5aea4172c8e59d..e11b715a49efbf 100644 --- a/.ci-builders/runner7-circle-rpm7/Dockerfile +++ b/.ci-builders/runner7-circle-rpm7/Dockerfile @@ -52,9 +52,7 @@ RUN cd tmp/ && curl -OL https://www.kernel.org/pub/software/scm/git/git-2.10.1.t RUN git config --global user.email "gitlab@stackstate" && git config --global user.name "Gitlab Stackstate" # RVM -COPY ./rvm/gpg-keys /gpg-keys -RUN gpg --import /gpg-keys/* -RUN rm -rf /gpg-keys +RUN gpg --keyserver hkp://pgp.mit.edu --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB RUN curl -sSL https://get.rvm.io | bash -s stable --version latest-1.29 RUN /bin/bash -l -c "rvm requirements" RUN /bin/bash -l -c "rvm install 2.4.2 && rvm cleanup all" From f479c332fbe02cce28c91c8c73c96360d30944bd Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Wed, 4 May 2022 10:57:02 +0200 Subject: [PATCH 58/81] STAC-15134 Fix rvm gpg keys [2] --- .ci-builders/runner7-circle-rpm7/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.ci-builders/runner7-circle-rpm7/Dockerfile b/.ci-builders/runner7-circle-rpm7/Dockerfile index e11b715a49efbf..dccbc3b7faf38d 100644 --- a/.ci-builders/runner7-circle-rpm7/Dockerfile +++ b/.ci-builders/runner7-circle-rpm7/Dockerfile @@ -52,7 +52,9 @@ RUN cd tmp/ && curl -OL https://www.kernel.org/pub/software/scm/git/git-2.10.1.t RUN git config --global user.email "gitlab@stackstate" && git config --global user.name "Gitlab Stackstate" # RVM -RUN gpg --keyserver hkp://pgp.mit.edu --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB +#RUN gpg --keyserver hkp://pgp.mit.edu --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB +RUN curl -sSL https://rvm.io/mpapis.asc | gpg --import - +RUN curl -sSL https://rvm.io/pkuczynski.asc | gpg --import - RUN curl -sSL https://get.rvm.io | bash -s stable --version latest-1.29 RUN /bin/bash -l -c "rvm requirements" RUN /bin/bash -l -c "rvm install 2.4.2 && rvm cleanup all" From 58a487f710321989835599f2f4d77e9419bec2ec Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Wed, 4 May 2022 11:21:42 +0200 Subject: [PATCH 59/81] STAC-15134 Change rpmpublisher base image to python --- .../rvm/gpg-keys/README.md | 7 - .../rvm/gpg-keys/mpapis.asc | 580 ------------------ .../rvm/gpg-keys/pkuczynski.asc | 51 -- .../Dockerfile | 9 +- .../entrypoint.sh | 19 - .gitlab-ci-build-runners.yml | 11 +- 6 files changed, 7 insertions(+), 670 deletions(-) delete mode 100644 .ci-builders/runner7-circle-rpm7/rvm/gpg-keys/README.md delete mode 100644 .ci-builders/runner7-circle-rpm7/rvm/gpg-keys/mpapis.asc delete mode 100644 .ci-builders/runner7-circle-rpm7/rvm/gpg-keys/pkuczynski.asc delete mode 100644 .ci-builders/runner7-gitlab-deb-rpmpublisher/entrypoint.sh diff --git a/.ci-builders/runner7-circle-rpm7/rvm/gpg-keys/README.md b/.ci-builders/runner7-circle-rpm7/rvm/gpg-keys/README.md deleted file mode 100644 index a5c4df456a7d6b..00000000000000 --- a/.ci-builders/runner7-circle-rpm7/rvm/gpg-keys/README.md +++ /dev/null @@ -1,7 +0,0 @@ -Source: https://rvm.io/rvm/security - -curl -sSL https://rvm.io/pkuczynski.asc | sha256sum -d33ce5907fe28e6938feab7f63a9ef8a26a565878b1ad5bce063a86019aeaf77 - -curl -sSL https://rvm.io/mpapis.asc | sha256sum -08f64631c598cbe4398c5850725c8e6ab60dc5d86b6214e069d7ced1d546043b diff --git a/.ci-builders/runner7-circle-rpm7/rvm/gpg-keys/mpapis.asc b/.ci-builders/runner7-circle-rpm7/rvm/gpg-keys/mpapis.asc deleted file mode 100644 index 02a36a29b5f04b..00000000000000 --- a/.ci-builders/runner7-circle-rpm7/rvm/gpg-keys/mpapis.asc +++ /dev/null @@ -1,580 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2 - -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 -8wvlb9/is1iN7h7+s2GDPpvEJrrnpeHeNTX1BEeykvbjW+Bsb89g6kJfks7PvhD+ -BQwVMaNrmjR8KYi+GaopHdQ30yLWD4ck97B+UYZnqSKk7E8NOpwU22b31VlZgI/J -XWeXgQ5cY58J0ShGmbfypHXerthzlm6UHzjg6g+yujqDrxaOPTdfxYAzJmX5ztk3 -D9xMEhCAD8ypefTdMGQb0B2q5Yjsl3sHqNNqxTeg1iorUNz6UtEhX3RmGrTDdY0r -gn0prjgiMTEMWWxAmgeYw/gOkpWfEZNrX64La65OkhTg+aBZEe6broHrc1x6dXpo -RkxGJrlRfcsxOcgy2M0/C0gk1L1yYWXRL4yENkQ/hNuPZmdDtrvWxcSTnMPfclwq -6kklflC099ujCZf5NuOG80mZi03917LQBtgWp4INmG+B6aLY52KuINmWXm25wYPY -5MfEbyO2KzngJSpxdR90GbP4F5lri2Ho9eSByisb0dLq0ugBEAABAQAAAAAAAAAA -AAAAAP/Y/+AAEEpGSUYAAQEBAGAAYAAA/+EAQEV4aWYAAElJKgAIAAAAAQBphwQA -AQAAABoAAAAAAAAAAgACoAkAAQAAAJ8AAAADoAkAAQAAAJ8AAAAAAAAA/9sAQwAI -BgYHBgUIBwcHCQkICgwUDQwLCwwZEhMPFB0aHx4dGhwcICQuJyAiLCMcHCg3KSww -MTQ0NB8nOT04MjwuMzQy/9sAQwEJCQkMCwwYDQ0YMiEcITIyMjIyMjIyMjIyMjIy -MjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy/8AAEQgAnwCfAwEi -AAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIB -AwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNi -coIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0 -dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfI -ycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEA -AAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYS -QVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpD -REVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZ -mqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz -9PX29/j5+v/aAAwDAQACEQMRAD8A9YFKTzRikxikSLTutMpw6UAKBRxQc9qOaYCe -1I2BznisHX/FdnoSFW/fXH/PNT0+p7V5J4k8calrExRZXgg/55xEgd+vrWsKTlqc -dXGQjLljqz2TUvEekaTj7ZfRIx/hzk/kKoQ+PvDMzhBqiBiM/MrAfnjFfP085kIB -YsR+NN+6gYnB7YrT2MTH63U3PoR/HXhqPJ/tSM4/uqx/kKt6d4p0TU5PLtNSheT+ -6x2n8jivnaJgY8k80hlYEccU/YR7krGVL7H1CCGGVII9jTq+crDxXqWkSIba8lXB -4Utkfka9C8O/Fe3vJEt9Xg8h+nnpypPuO1ZyotbanRTxal8SseldTQRmo4Z47iJZ -InV42GQynINS8isTrTuJ04oNGaSgYn1opN3PSlwKAHGlptLSAMYpRSHmkBzQA+qe -rX8emafLdSZwo4x69qtj61w/xGvzHawWcbcsDI/8h/WtqMOeaRy4ys6VFyW55V4n -vp7jUZHMpO87ic9c1iIk0gOwE+tdr4Z8HXPia482bKWqHBf19q9V0/wHo9lEgFsr -Mv8AEwrerVjB2OHC4WpOmrfefP8AHpV4SCsTE4yRtNWf7DvPL3NA+BzX0eugWIx+ -4TI74qZ9EtGTaYUwO2Kw+sdkdf1CT3kfNqac8Iw8Lg9uKryQYypVlr6Kn8L2MnWF -fxFYOqeB7O4B8uMBs5qvrK6oyeW1L3TPBpok5yeRUEbmE9Rkd69UvvhqzZMbY9hX -I6v4Lv8AT4jIIyyDrgU41oN6Ml4erFe8tDX+H/jT+xrs2d27NaTsOevln1r28HIy -Dwa+UlLRTLkYIPIr6D8AazJq/htDK+6aBvLY47dv0pVVdcyNcNPll7N9djqqPwop -CawO8UYopM4pRQIWiikpDFopKUelAB0ryzxFu1vxXNDGSwVxGMdgOD+ua9L1C7Fn -p9xcn/llGWH1xxXE+DLLdI91McyO3X1rswz5IyqM8jMr1alOguup3Oj2EWnadFbx -IFCqK0Vf3qGPg1IUJrz27u579OKhFRRMHWnF6r7HHSj5h1oTG0Pds1A4ycU4saru -zFj1pNlJCPtHXFUrm2hnQo6Ag9sVM6uxpqoQcv0HSsy2lY8Y+IHhRdLuRe2qfuZD -yAOhrY+EN7i5v7Jj96MSAfQ4/rXceJLOPUNJnikGRtJFeYeCQ+keO7dTxHKWj9sE -cfrivRo3nSZ4OJ5aWJX3ntxNBGaM8ZNJmsDvCnA4ppOBSr05oAdTSCehp3egdaQw -xx0oXmlPNC0wMLxZNjQZEx991UjPXnP9Ki0O2ECxLtClVHA6CtTV7VJbINMuUVw2 -fTFRWbots04OVY8EelaSqpUeVHFDDOWN9pLayNiLnGasBgvU15hqHj+5hvJYoIY/ -KQkBt3LYrNl+J8qEHy2Udw1cXOj2eRs9kDrTXkQ8V5Rb/E5JpY02qV43EHmuj03x -TFqJAjbLdcU/aIapNnYYQ0AR461zF/rn2Ncvwvqax5/H1raMqyc5HJz0o50ynSaV -2d40aYzVW4jGw4rjofHkFzIRGvy4zuLDApZPH1hFtWSVMdCcjj8qTkibNGnqEhWF -0znjpXmN0wtdbimG4NFKGBHsc1341O21NfMgkDoRwVrz3WAU1p1zzu/Wu/AT1cTw -88pe7Gouh7WrCRFdfusAacR6CobLIsLcHIPlr/Kpj3rJ7nbB3imwwB9aKO2KXoKQ -x1Hc0gIYceuKWkMOcUo6UtJmmBkTXEpa8t5OYyxMftwOK4qHWdQ/tk+Gm067gtS7 -bbwblV1CltoOOpxjg5xn611mr3xi1G3tkUEyuAfp3P5Vb+yC4lt5N20wymQDHXKM -uP8Ax7P4Vzc28TtlT1U32PLdU2WDymS0Z33HYqpkmuZvdbv4wG/sdVB7OCT+QHvX -vN5o0Nyd20Bx0OKxbvw/MxwGVvrGP51Cunqa2jJaOx4zBdedKgn06FHk5Uxg5/nX -Z+GUe01GHbbzziVWIiUqGGMc/MQMc+ueldInhFFkEsuxSDkAKM1P4Q0Ce38VX15P -K8sUOUi3LgLuwcD6KF5/2qe7B+6tDO8ZTzHSXdtMvoQAMtI0RA+u1yf0ry65mtkY -LKkszdBtcpn+dfQ/jSx+3+HLy1jQGWSFlQ4744rynTvC8l7plvcNHHM7rnDDBA7c -+uOvvVNKLJi3NJHBrqOnLN5UunzhunMpbH4VejXTr1SYUYEdU3kGu0HhJGfJ0rcw -PJ4B/OpY/BCmUObVYMHs2c1LmuhSptblLQZzpukvcxu6wQHdLHJhsL/EQQBjA579 -KNOvNN1rVxfKfPV5QsaEFAAoyzH17cV1FxoUdvpUttGgYTLtdW6FSQD+ma5u/sbK -zuo47OOK23KVCxqFGMjPArSnV5Nepz1sOqrUbXVz0fS/EEWqapLY28X7qCIM0o6E -5HArbzXIeCrQW816/UuEwfb/AD/Kuv8AerpNtXZGJjGNS0ULj1opKU1ocw6koIyK -O1IoXPpTQRmjgUnfNAjPvLZZLn7UOHhUqQR1zwCP1FS2uMBiakupl+zSRZAbg47n -msee++zoornlZM9GF5JXN8yM3AbH4Zqvc3HlIWecAe6isT+1gI8lv1rm9T1aXULl -bSBiWY4PPQVLqHRGjrrsdNb6gdVuzBby5C/eYDFdLZbEUAMCe5FcLL5uhacJLBVa -bbhgf4q5608Yana+ZLcxbWJ6K3H60ou24VIKXw6Hq+pS5Bwa4hL6bTdTMFzs8t+Y -ziuW1Xx7cy24SMNv9FNOsdRfV4A1zuAjGFz2z1olK+qHTgo6M9LimV0DbF6fwmkY -xsT8pP1ri9K1p7aT7PKxO3hTnqK15dXXH3qXPcbpW2J9VlKwMEAAx0FcZf2TXV7a -yIf3pymPbI5/nWzNqRugyL0xirVlYPd2jBGMZJwXA5x6Z7UlqZr3JHSeH4Fg01SC -DuOM+oHH+Nap6VBawJa2sVug+WNQoqftXalZWPKqS5pNhmgmkx6UgAzTIJc+tHem -5BpQBSGBBzxQaUUNTEUry3ilQyMgLoCVboRXNX6GTdt7jNdc3PBHFcs58u4eGTqr -FT/Q1z1kduFl0MDUDLHZkR5J6VDo1stvNvndPNbkjPSt94IyxRhlT61gatocl2ri -1uGtps/LItcy0Z36yVjqmCSxBcjkd/WuU1rRDJGTCAWHUKetYFnpWsRytb6pfTBl -YYmDfKQT+nFaz6C6Ws8qa0A8TEAhxjoCM+nWtHOzsxKCW7MgeHnRi0oXJPc1q2tv -FZQshdeTyB6VWvdDEflmbWkZmVmJMg5x6Vyk1hqt5dJDZTSRx/xSliM0lLmdinFd -DpLgGWTdG4BU8VYSSeS0VjkE0zR/D+x0SadpnH3nY9a3rm3iR44kXEaDpUS3Hdoz -7SNojljyeTXYaJpeokQyyzQrZkB1Vcl2zzg8YH61yrZmu44IgN0jBF+pOBXp8aLF -Eka/dQBR9BW9GF9WcGIquLshcYNO7Yph60ZJrqOAdnPamUo601zhc5xQMzBr1uf4 -Jf8Av2aUa/bZ+5N/3wa1/sdt6/8AjtIbK37MP++anUNDK/4SK1z9yb/vg0f8JFbY -+5L/AN8GtQ2lt/eH/fNH2W19R/3zR7waGWdetM5xJ/3waw9avIZblLmDcMjEgKkf -Q1132W1J+8P++ajubC0ntpYm2kMpHSpkm0aUp8srnGi7VwOOfWpoGLHGec1iBzDc -Pbt1UkCtiwAeZW3Ae2a5Op6qlbULqSNP9am0f3sZx9axbiXSjIPPt9Pdh/G2M/ka -66501LpfmyAay5PBtnMN0hbJ9MCrXMaxqxSOamm0wcW8dlFzyY1GT+VPtdkjZjTI -HG4962JPClpaNlGY5PGcVcisIbVBjkHnPtUyuVKomjOgH2bLSdevFZ9xeDc0h4z0 -qa/u1ZiiYxzXO311j5FOT0qLGLlc6HwxPbf219ru5VSOAEru7uen5DP6V3X/AAkO -l97yL86860W/utNgjEOlJqKPukmTftlAGOUzwT7e1auo+KNAis7W/wDskkljckqk -0aA7HHVHXghv5jmuum9LI83ERfNdnZf2/pZHF5Efxo/tzTyeLhPzrmtP1XwjehjH -qlmhHJE2Yv8A0IDP4Vv2lhpF/Hvs5rO4QdWikVgPyrT3jn0JxrNiy5NzGPbdzVS9 -1m1KMqXMYAwSxNW20Cz7RQ/pXP6vokC2o2qil5OCCPQ/4VMnKxUUrncKOelLt4zg -4p5ULGXLAAcmmWWoQ3UX7p1kGSMocim5paFxpSaG7Qe1IAOeBx19q8+1P4iz6H41 -udLvIEnsEx80I+dBgc8nB69OK868UeJv7X8R3M9rNcixmA8uOU4KnA3AgEjrmqV3 -sQ0k3c9e1nx5oWjlkNz9pmGcpb4bH1boKQeINSlhtoRbRQXlwqTSggt9ljb7qnP3 -pGAJ7BQDxxz4lpaR3Otabay48ua7iR8/3S4B/SvV9O1Rr/xNqCSqVddQus577QI1 -/JVrOu+SJvg6Ptajvsk39xW1m1InNxGPmzzVaC+dIhIjZI6jFdJdQhlYYzmuU1K0 -ls5TNBnbnkdjXIjs3RtWvi2AAo/GOoParra5HIg2uB3zmuDmFrdncy7JPbiq7LcR -f6ufIHTNXzMuMTurjXYoSWkmDccVzt/4qeZWSMfMRgAdhXPS+dJ/rZSaZujg6fM3 -rSuNouTXRVOSd3qaqW8bTzbjzzzSQwS3cnfHf2roLKyWJRxj8Km9hWHed/ZiWMyn -DLcA4/2cc/pXOpcJqGkeOIo8G1jmS8g9FbzduR9VYitDxBcqk6gt8sEZZh6f5xXO -aIxtvh94iumGPtlxb2iH1IJkb9APzrTDNuUjTMqSp4ei+ru/l0MMTFcZ65qzpN9e -6XqY1CzupYZwdo2twR6Edx7GswOS3TpVpD0Ga7zxD0bSvidqtoxGoJHeRMDycIwO -OMEDBH4VatPHEmsXCW17bwRIWLI6ZGMBuDk+9eY7y0p54UfmasRzHJANRNFQ0Z7h -ZfEfTF0aO8upM3EgwIFOSG7gj/PUV5/a+NbnSTqsWlBYILucyIp5MQPZfTtXFJIU -j445JpQ/7z681MaKW5rLEN7aE97eyzXstzM7SySYLs3U1UuPnlQLx8vFK53TAdiM -Uw5Gz/ZO2trWMG23dkkNzLDLHKh2zRsHQ+jA5Feoalr2n6bqlp4hiObK+ZbiTaPu -GQEP+T7vyryqYEHIPvXQeHbGLxHZPoctw0TyygW7kEhXYEqD7Ejn65rnxEOZL1O7 -L6nJKfnFnssdzDdwpNbyrJFINyuhyCKr3NsJoypGa8P0fxPq/hK8ltAweKNystvI -cruBwcEdD9P1r07QviFo+sFIJPNtrlv+WboWBPsR/XFc86UkOnWi9yvqGj/vGZFx -9DWHPbXUJIJYfUV6RcQJIm7gg9DWFd2KnPzY/Csrs6YtHEMs7NyGwfbFWrbT3lYF -hWldNY2AMl1NsX12k/yFYt3470mzBSzhluHHfGxfzPP6U0pS2QpVIx3Z1FrZrEg6 -ADtWN4g8X2ekK0Fsy3F50CKeFPuf6VxGqeMtV1MNGsgtoTxsi4J+p61labD5t/EX -5VTvOe+Oa1jRsryMfbe0moQ6nRaxdztZJC7mS6uCA+Op9f14q74q2aNpel+GEJ8y -yQ3N7/18SAEr/wABXaPzqbwv5MU974tv4/NtNJ2+RD/z0nY/uwfQA5Yn2FcleTz3 -11JcXEheeeQySuerMTkmtqMOWIsyxKr1vd+GOi9EJGmRn1qyPlGT2qNBgClkYCPH -rXQecKudnPU80/fsHqe9IKhmbFTLYqL1P//ZiQI3BBMBCAAhBQJYseahAhsDBQsJ -CAcCBhUICQoLAgQWAgMBAh4BAheAAAoJEDgEu4LTncDjYawP/0CafFAJq4OAlFl1 -bhb4BTiw3eAbRnifGpBUldTpxxp65UJyXtqA3wX3ggbhXMWnb5zMOh06HzVUFJ7S -nse3cxAHgi9+qqueBI53Zx1btPlJNX/AIv6TlESRMZJXE3y2pSBdmwW/tiXr5fC5 -RJqpgUevKfq3eW33aUtybE48FqmLqDJjyAvAbF/jKHY0Zahz7iCVkWJwufoGxkcI -MMLYh1R633DT2yDSti4xS8xKUYJsiiw2B2t//Ux6zoNh3gzBEeMoRDRFPuC3ibfd -kwC9zMkbDMNSMSlSB8F0sn52k93uQcnR1jWoWc5nSz9x5m1I3xo0Zl0I5YNIkDIN -z0SL426fN9zBSPHPnXsoOXOnDSF5xGt1Wzg3Do/kErFzlKPExqo5j+W5RbRznuZR -+uQw0nvCNGS3kfASbAaXR5lkb0VJiIliLM5HzXKi6W662y/XX5iQDkWx7UjjmTx5 -x7r12RYA6mwLJWlpNQoK4kWDlllUn1QpC+wqjTKePPMM/1vyqlh14tRVurxWTZPA -h6/2kzrb0a0noq4YBeCNjOU2Ri+1RXZJkthjn2eNsXEvLCp104H7W0uHwDAofiOk -X99T823H6dIUEllIyiX5DRyRimZYqC6ux5Qq8AKVJmAKY3+z61W+psmFqVXckSMu -8fd03DXvVgx60WWgGkGj8hEcoBe3uQINBFRQBC8BEADRTWbSpwvuyjGkPQxCsWs2 -df7qxEbj+NvzETDY7yeyWN49zll0zz1pCYZ11BtzCSiZWTLe9Ngk+PJsP4t87gZM -whNgG4YvIEJ9BIcpkPDCMvMyMW6Y8J0rPPjGrscLAPnIQg8VTZmsTGeEBUXsQNHF -igeBH/OL0Rwf4ydhUt4SfgldrcBCfS2EkJH4ULhUw5enhkfp5tt3k5l0C9Wa6+qW -YMEdhnN6rBjXGfwksgZAh2VfW7BNbidtuaCn8ZqrSf4p0kC3YdClW0wcDSGfT+Pp -OE04waycxUMB7gH8wvI8phcMSHj7rRJPui6rXytS14AI0BKinfXh0Tw9QwU6V8Cx -Wwq0/SFwcD10Q8Y7gDLfevzptKISpN05ACNSqCf1WmBZn63FWxk68r3JYrxFEYQv -VWHMAOQB1doODgrv+84xTxhcn781SAxA/F1BOtMgf/wgiUXUClxn7k4Cf27kLiZb -471SM8GTjoi5IVg7WyvN3p9wI6KWy7IrrvuwZKxXvr65Q3iDliVP1j0236PaBGJt -gznNhaHPyWkaDwBZW9MXQlejc+ixaeTceE9BqKvn+0Z1Dhx7WCzfBPgDkqSVLQP5 -O9kg9qjxkN2TkuQlWVVNJL+0reeQm7CSEyA5SjtZjOmnC9bcHDsnLlzPw8Qt9g9O -Ih8XUhr6inF3k6UrB55nqQARAQABiQREBBgBAgAPAhsCBQJYsb3rBQkIM/K8AinB -XSAEGQECAAYFAlRQBC8ACgkQ4gbCn78E/xc2jxAAsFu+jcO/pKvyixFilobPztif -tnk5NQ207eVA5rV6r/UV2ngBUn35YGpot1zltevXGs6hpS7jnvOtRgHYGjXxVEdG -/qFbqqHMOhjbNtQYLJBusPZI+L3hImiDCuipdy6d1uPGuXbiZ+jCyRj1FsLbA7HR -GHHFqkH6Yx7YM3FJV4VKzOw7pBrLM69fGu0WWFWqCf70ErreZudsF1EOjjpyUAMJ -O3ktKXUIRPNHSizAjgxDFW2hkkbILeBUbq6Qy5Qkt+K9tLrL08MloXSYiRnB/aIq -DF+mKc01292KkmUSy2AFX3xcrZDdwPZCmn9u2sbQ+yxek25cqbyG0qA9ihjrh/j1 -VILNs8kXUglI6qaj40aWeBlU+kCjedII2QNjWiye+0pbtrm512VUUaGm6xZHyE/5 -iy9Xyogi4L7r1xPxEG/n2dIQJUzkTpuy3ZDZot/eXYc6rMhDGrWXBk3Vy4j/feYo -MhaWazYZf9jOU6wCHoUHM8LhwE2rgEk65f01yIGoMba8e372N/3lPKl8LUoYJ36k -97HLtapSewPKe793e6jsOH3SGGVJRQJ3BhKfxo60xNTi31aQz0mdX4jaDiGQSXAK -wfjO8kEbFEunI06TcXCbBD/NMz6MnabC6CbCu76vF2vIFjXAnh7snFmmJL9/0FKP -nHAn1OV+RVPjQJxovtgJEDgEu4LTncDj8nYP/18SgUQ7yUTgc2DjwVOlrUFgL5TP -WtqjiRPaiUC5GwW/aFRKGyD0BcUaFFxJP2qhR5zMdmPrbZq9jTzPqPbDfq7Pin75 -pRLg0LIPjDWuygqhXIRECxSBsl5OA+zPsyoZEos0sZZI88OFAQR3jXwWANA6hlLY -oXohND92bk8s7BcQr9XJqghk93X0TX2HMJxExLKfp1jFF6gFEWpeqx91DIhQyKLS -txOeFCPsf8dUccg7QrgHZ60wE8W9jbDQW7kwhOlQ27ClvKKW1H/ZQTg3eFFc4IuI -86tAAb+AJNlr7CGyf5sQfzqMdPxy9ywvg3Kk9VEK7Y1mHGVcsvqAlfyOgOMJc0fZ -2U/1tDEKjk18KNxGsiIRrrwdYT9irwE0hmgWc3o4lxV6zFNJ1pxcmKkRhCMthNa3 -1KCKBiZDhZMQY5fSmUmNAFEsV92Z1o29BF3rK5FmH4FLueO+39aAoZiZO3W2jtrS -elzq6ol5XlAOB7Ol7o6p+9M1gVx4OgYaR5k/9jDgeI47MMW81rBSxG0FQeRu0zlB -2/o12Wf5RAz/laXISIUekapwlU5FYMjoP+ziAFZMN9QAbo0MLCuvj8FqX/B7NpeB -B+VNeou2GdK5+DPbn2sHWp1rtayNVipqMhWlEyrmsFHvkDFDcGYRSKbuSCd7O+PK -ZpCkfwcZAXF25edquQENBFY3Xw0BCADsNcfIEJ23NJ9GmIyotqT6MUggt2CLTAON -/ats4TeI4et851NdVI1GBMVChcmNhN36wY0OS2J+lSfozyDqksgRojMFs3Bjvn4x -EdvS7UU6UdX3TTSiy2RamLdjJjd9QA9JznOXxY/q0kIW6A9gG58D/tKt43AdQdgl -Q5XEMG5JY11rS9bNIrDk+QsNv8bUcN6ElFTWzOXMdFyqm0Im6ZWcxhlSdgbJG2HE -86L/DemLdNwOXetL4V2csWz+ZTY6+S6jbk2T2gSqUSel52voVU60k/HxMckYUBOa -UsAxPY0R1/XV3nRfhZQVfGSfMpzvrggi5Whz1uZ8fVmyTrK5H3dfABEBAAGJAh8E -GAECAAkFAlY3Xw0CGwwACgkQOAS7gtOdwOMgJg/9F2B+yY0bHwja0LHJ6+WhQYyR -dSmis5JlAL49EPEGFCptA5mECgUF48F84ZU4tlVs9sbzmKH8U9BVPU4EECHgf1Hf -trX+EoXf8n5BejdvKygFyzevoA2IEqH3u8WkDrOLXoNXDI2CcT4Uu25cQGJB6lvV -r8ohUZ2Q3krZzugCZtDhSclG56/rk+2MhApT3yeOcs2ED1htvdnU7OIeAxwP8Rcu -0f8kWUoGvJ3KlbmA6DoMrvlVRheJsKDLXcUV6XGKd2o5CDuKuNbPx5MIg4i5FwcA -R8gbNGsNVOX29g57YWZnXj7rKF0Ab2Vmx9Ir/y0qoRoSfLgH7no6io2Wx30i8mfq -2qd/6RwHi4/KimJJs9Xle9BQWb0kGU2FCnzmc8gAXoiGdzUTdvRxtHa2l8HOPlI7 -8z0cklwWr1cdnUXU87zJisqGFKvbyTNBEJmItXswDEuQcbzIsIMyDM5REdesH1Op -SJBc/A095yy/JuT7618R4T6BaWDD0oEvBtCds36Vd2jwtTRBb5cXvcfMc1Rfo5lN -afpO//HcKgJ/Oa4zAmKaXURzi+rBrxO+CGVpXQex+4+cohxxZ6gTbgNxYmGA7v55 -6HDxJBUyytvlzGiKqg97GKsHiISy4o5BLQPYFMpCNgB3rcb5RR0v5tGeeuhraXOo -2lPgP440izPGh5s38Oc= -=8riE ------END PGP PUBLIC KEY BLOCK----- diff --git a/.ci-builders/runner7-circle-rpm7/rvm/gpg-keys/pkuczynski.asc b/.ci-builders/runner7-circle-rpm7/rvm/gpg-keys/pkuczynski.asc deleted file mode 100644 index e5c71748a8701e..00000000000000 --- a/.ci-builders/runner7-circle-rpm7/rvm/gpg-keys/pkuczynski.asc +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -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 -iWTuv7mXY0bNG+s= -=X3ZS ------END PGP PUBLIC KEY BLOCK----- diff --git a/.ci-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile b/.ci-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile index 90cbcc101ec150..23c784a7d5ab5c 100644 --- a/.ci-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile +++ b/.ci-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile @@ -1,13 +1,8 @@ -ARG BASE_RUNNER_IMAGE_VERSION=deb7_latest -FROM docker.io/stackstate/stackstate-agent-runner-circle:${BASE_RUNNER_IMAGE_VERSION} +ARG BASE_RUNNER_IMAGE_VERSION=python:3.10.4-slim-buster +FROM docker.io/${BASE_RUNNER_IMAGE_VERSION} RUN pip install boto3 sts-rpm-s3==0.3.3 invoke distro==1.4.0 awscli==1.16 RUN apt update && apt-get install -y libkrb5-dev unixodbc-dev rpm python-deltarpm createrepo yum-utils ADD rpmmacros /root/.rpmmacros -# Entrypoint -COPY ./entrypoint.sh / -RUN chmod +x /entrypoint.sh - -ENTRYPOINT ["/entrypoint.sh"] diff --git a/.ci-builders/runner7-gitlab-deb-rpmpublisher/entrypoint.sh b/.ci-builders/runner7-gitlab-deb-rpmpublisher/entrypoint.sh deleted file mode 100644 index 8f2178732098b0..00000000000000 --- a/.ci-builders/runner7-gitlab-deb-rpmpublisher/entrypoint.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -l -set -e - -source /root/.bashrc - -if command -v conda; then - # Only try to use conda if it's installed. - # On ARM images, we use the system Python 3 because conda is not supported. - conda deactivate -fi - -#if [ "$DD_TARGET_ARCH" = "arm64v8" ] ; then -# export GIMME_ARCH=arm64 -#elif [ "$DD_TARGET_ARCH" = "arm32v7" ] ; then -# export GIMME_ARCH=arm -#fi -#eval "$(gimme)" - -exec "$@" diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index 7d108dc090cb83..88e199d519f4ce 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -87,7 +87,7 @@ build-centos7-base: # BUILD RUNNER IMAGES FROM BASE IMAGE ################################################################################# -.docker_main_runner_build_base: &docker_main_runner_build_base +.docker_build_runner: &docker_build_runner <<: *docker_build_base stage: build_runners script: @@ -109,7 +109,7 @@ build-centos7-base: # produces the runner deb image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb7_{yyyymmdd} build-main-deb-runner: - <<: *docker_main_runner_build_base + <<: *docker_build_runner needs: [ build-deb-base ] variables: RUNNER_DIR: $RUNNER_DEB @@ -118,16 +118,15 @@ build-main-deb-runner: # produces the runner deb/rpm publisher image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_{yyyymmdd} build-deb-rpm-publisher-runner: - <<: *docker_main_runner_build_base - needs: [ build-deb-base ] + <<: *docker_build_runner variables: RUNNER_DIR: $RUNNER_DEB_RPM_PUBLISHER RUNNER_IMAGE_VERSION: "deb-rpmpublisher" - BASE_RUNNER_IMAGE_VERSION: "deb7" + BASE_RUNNER_IMAGE_VERSION: "python:3.10.4-slim-buster" # produces the runner centos 7 image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7_20211004_v7_0 build-centos7-runner: - <<: *docker_main_runner_build_base + <<: *docker_build_runner needs: [ build-centos7-base ] variables: RUNNER_DIR: $RUNNER_CENTOS7 From 69287ff29b16ff9249a8076e9970a7503ef3ad8b Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Wed, 4 May 2022 14:22:28 +0200 Subject: [PATCH 60/81] STAC-15134 Refactor everything --- .../Dockerfile | 0 .../Makefile | 0 .../conda.sh | 0 .../entrypoint.sh | 0 .../gobin.sh | 0 .../rpm-headers/README.md | 0 .../rpm-headers/systemd/_sd-common.h | 0 .../rpm-headers/systemd/sd-id128.h | 0 .../rpm-headers/systemd/sd-journal.h | 0 .../rvm/gpg-keys/mpapis.asc | 0 .../rvm/gpg-keys/pkuczynski.asc | 0 .../Dockerfile | 0 .../Makefile | 0 .../conda.sh | 0 .../entrypoint.sh | 0 .../gobin.sh | 0 .../rpm-headers/README.md | 0 .../rpm-headers/systemd/_sd-common.h | 0 .../rpm-headers/systemd/sd-id128.h | 0 .../rpm-headers/systemd/sd-journal.h | 0 .../Dockerfile | 4 +- .../{runner7-gitlab-rpm7 => centos7}/Makefile | 4 +- .../Readme.md | 0 .../{runner7-circle-deb => centos7}/rpmmacros | 0 .../Dockerfile | 0 .../Makefile | 0 .../conda.sh | 0 .../entrypoint.sh | 0 .../gobin.sh | 0 .../mqlicense.sh | 0 .../rpmmacros | 0 .../rvm/gpg-keys/mpapis.asc | 0 .../rvm/gpg-keys/pkuczynski.asc | 0 .../Dockerfile | 4 +- .ci-builders/debian-rpmpublisher/Makefile | 8 +++ .../rpmmacros | 0 .../{runner7-gitlab-deb => debian}/Dockerfile | 4 +- .../{runner7-gitlab-deb => debian}/Makefile | 4 +- .../{runner7-gitlab-deb => debian}/rpmmacros | 0 .../runner7-gitlab-deb-rpmpublisher/Makefile | 8 --- .gitlab-ci-build-runners.yml | 72 +++++++++---------- 41 files changed, 54 insertions(+), 54 deletions(-) rename .ci-builders/{runner7-circle-rpm => centos6-base}/Dockerfile (100%) rename .ci-builders/{runner7-circle-rpm => centos6-base}/Makefile (100%) rename .ci-builders/{runner7-circle-deb => centos6-base}/conda.sh (100%) rename .ci-builders/{runner7-circle-rpm => centos6-base}/entrypoint.sh (100%) rename .ci-builders/{runner7-circle-rpm => centos6-base}/gobin.sh (100%) rename .ci-builders/{runner7-circle-rpm => centos6-base}/rpm-headers/README.md (100%) rename .ci-builders/{runner7-circle-rpm => centos6-base}/rpm-headers/systemd/_sd-common.h (100%) rename .ci-builders/{runner7-circle-rpm => centos6-base}/rpm-headers/systemd/sd-id128.h (100%) rename .ci-builders/{runner7-circle-rpm => centos6-base}/rpm-headers/systemd/sd-journal.h (100%) rename .ci-builders/{runner7-circle-deb => centos6-base}/rvm/gpg-keys/mpapis.asc (100%) rename .ci-builders/{runner7-circle-deb => centos6-base}/rvm/gpg-keys/pkuczynski.asc (100%) rename .ci-builders/{runner7-circle-rpm7 => centos7-base}/Dockerfile (100%) rename .ci-builders/{runner7-circle-rpm7 => centos7-base}/Makefile (100%) rename .ci-builders/{runner7-circle-rpm => centos7-base}/conda.sh (100%) rename .ci-builders/{runner7-circle-rpm7 => centos7-base}/entrypoint.sh (100%) rename .ci-builders/{runner7-circle-rpm7 => centos7-base}/gobin.sh (100%) rename .ci-builders/{runner7-circle-rpm7 => centos7-base}/rpm-headers/README.md (100%) rename .ci-builders/{runner7-circle-rpm7 => centos7-base}/rpm-headers/systemd/_sd-common.h (100%) rename .ci-builders/{runner7-circle-rpm7 => centos7-base}/rpm-headers/systemd/sd-id128.h (100%) rename .ci-builders/{runner7-circle-rpm7 => centos7-base}/rpm-headers/systemd/sd-journal.h (100%) rename .ci-builders/{runner7-gitlab-rpm7 => centos7}/Dockerfile (95%) rename .ci-builders/{runner7-gitlab-rpm7 => centos7}/Makefile (52%) rename .ci-builders/{runner7-gitlab-rpm7 => centos7}/Readme.md (100%) rename .ci-builders/{runner7-circle-deb => centos7}/rpmmacros (100%) rename .ci-builders/{runner7-circle-deb => debian-base}/Dockerfile (100%) rename .ci-builders/{runner7-circle-deb => debian-base}/Makefile (100%) rename .ci-builders/{runner7-circle-rpm7 => debian-base}/conda.sh (100%) rename .ci-builders/{runner7-circle-deb => debian-base}/entrypoint.sh (100%) rename .ci-builders/{runner7-circle-deb => debian-base}/gobin.sh (100%) rename .ci-builders/{runner7-circle-deb => debian-base}/mqlicense.sh (100%) rename .ci-builders/{runner7-gitlab-deb-rpmpublisher => debian-base}/rpmmacros (100%) rename .ci-builders/{runner7-circle-rpm => debian-base}/rvm/gpg-keys/mpapis.asc (100%) rename .ci-builders/{runner7-circle-rpm => debian-base}/rvm/gpg-keys/pkuczynski.asc (100%) rename .ci-builders/{runner7-gitlab-deb-rpmpublisher => debian-rpmpublisher}/Dockerfile (67%) create mode 100644 .ci-builders/debian-rpmpublisher/Makefile rename .ci-builders/{runner7-gitlab-rpm7 => debian-rpmpublisher}/rpmmacros (100%) rename .ci-builders/{runner7-gitlab-deb => debian}/Dockerfile (93%) rename .ci-builders/{runner7-gitlab-deb => debian}/Makefile (61%) rename .ci-builders/{runner7-gitlab-deb => debian}/rpmmacros (100%) delete mode 100644 .ci-builders/runner7-gitlab-deb-rpmpublisher/Makefile diff --git a/.ci-builders/runner7-circle-rpm/Dockerfile b/.ci-builders/centos6-base/Dockerfile similarity index 100% rename from .ci-builders/runner7-circle-rpm/Dockerfile rename to .ci-builders/centos6-base/Dockerfile diff --git a/.ci-builders/runner7-circle-rpm/Makefile b/.ci-builders/centos6-base/Makefile similarity index 100% rename from .ci-builders/runner7-circle-rpm/Makefile rename to .ci-builders/centos6-base/Makefile diff --git a/.ci-builders/runner7-circle-deb/conda.sh b/.ci-builders/centos6-base/conda.sh similarity index 100% rename from .ci-builders/runner7-circle-deb/conda.sh rename to .ci-builders/centos6-base/conda.sh diff --git a/.ci-builders/runner7-circle-rpm/entrypoint.sh b/.ci-builders/centos6-base/entrypoint.sh similarity index 100% rename from .ci-builders/runner7-circle-rpm/entrypoint.sh rename to .ci-builders/centos6-base/entrypoint.sh diff --git a/.ci-builders/runner7-circle-rpm/gobin.sh b/.ci-builders/centos6-base/gobin.sh similarity index 100% rename from .ci-builders/runner7-circle-rpm/gobin.sh rename to .ci-builders/centos6-base/gobin.sh diff --git a/.ci-builders/runner7-circle-rpm/rpm-headers/README.md b/.ci-builders/centos6-base/rpm-headers/README.md similarity index 100% rename from .ci-builders/runner7-circle-rpm/rpm-headers/README.md rename to .ci-builders/centos6-base/rpm-headers/README.md diff --git a/.ci-builders/runner7-circle-rpm/rpm-headers/systemd/_sd-common.h b/.ci-builders/centos6-base/rpm-headers/systemd/_sd-common.h similarity index 100% rename from .ci-builders/runner7-circle-rpm/rpm-headers/systemd/_sd-common.h rename to .ci-builders/centos6-base/rpm-headers/systemd/_sd-common.h diff --git a/.ci-builders/runner7-circle-rpm/rpm-headers/systemd/sd-id128.h b/.ci-builders/centos6-base/rpm-headers/systemd/sd-id128.h similarity index 100% rename from .ci-builders/runner7-circle-rpm/rpm-headers/systemd/sd-id128.h rename to .ci-builders/centos6-base/rpm-headers/systemd/sd-id128.h diff --git a/.ci-builders/runner7-circle-rpm/rpm-headers/systemd/sd-journal.h b/.ci-builders/centos6-base/rpm-headers/systemd/sd-journal.h similarity index 100% rename from .ci-builders/runner7-circle-rpm/rpm-headers/systemd/sd-journal.h rename to .ci-builders/centos6-base/rpm-headers/systemd/sd-journal.h diff --git a/.ci-builders/runner7-circle-deb/rvm/gpg-keys/mpapis.asc b/.ci-builders/centos6-base/rvm/gpg-keys/mpapis.asc similarity index 100% rename from .ci-builders/runner7-circle-deb/rvm/gpg-keys/mpapis.asc rename to .ci-builders/centos6-base/rvm/gpg-keys/mpapis.asc diff --git a/.ci-builders/runner7-circle-deb/rvm/gpg-keys/pkuczynski.asc b/.ci-builders/centos6-base/rvm/gpg-keys/pkuczynski.asc similarity index 100% rename from .ci-builders/runner7-circle-deb/rvm/gpg-keys/pkuczynski.asc rename to .ci-builders/centos6-base/rvm/gpg-keys/pkuczynski.asc diff --git a/.ci-builders/runner7-circle-rpm7/Dockerfile b/.ci-builders/centos7-base/Dockerfile similarity index 100% rename from .ci-builders/runner7-circle-rpm7/Dockerfile rename to .ci-builders/centos7-base/Dockerfile diff --git a/.ci-builders/runner7-circle-rpm7/Makefile b/.ci-builders/centos7-base/Makefile similarity index 100% rename from .ci-builders/runner7-circle-rpm7/Makefile rename to .ci-builders/centos7-base/Makefile diff --git a/.ci-builders/runner7-circle-rpm/conda.sh b/.ci-builders/centos7-base/conda.sh similarity index 100% rename from .ci-builders/runner7-circle-rpm/conda.sh rename to .ci-builders/centos7-base/conda.sh diff --git a/.ci-builders/runner7-circle-rpm7/entrypoint.sh b/.ci-builders/centos7-base/entrypoint.sh similarity index 100% rename from .ci-builders/runner7-circle-rpm7/entrypoint.sh rename to .ci-builders/centos7-base/entrypoint.sh diff --git a/.ci-builders/runner7-circle-rpm7/gobin.sh b/.ci-builders/centos7-base/gobin.sh similarity index 100% rename from .ci-builders/runner7-circle-rpm7/gobin.sh rename to .ci-builders/centos7-base/gobin.sh diff --git a/.ci-builders/runner7-circle-rpm7/rpm-headers/README.md b/.ci-builders/centos7-base/rpm-headers/README.md similarity index 100% rename from .ci-builders/runner7-circle-rpm7/rpm-headers/README.md rename to .ci-builders/centos7-base/rpm-headers/README.md diff --git a/.ci-builders/runner7-circle-rpm7/rpm-headers/systemd/_sd-common.h b/.ci-builders/centos7-base/rpm-headers/systemd/_sd-common.h similarity index 100% rename from .ci-builders/runner7-circle-rpm7/rpm-headers/systemd/_sd-common.h rename to .ci-builders/centos7-base/rpm-headers/systemd/_sd-common.h diff --git a/.ci-builders/runner7-circle-rpm7/rpm-headers/systemd/sd-id128.h b/.ci-builders/centos7-base/rpm-headers/systemd/sd-id128.h similarity index 100% rename from .ci-builders/runner7-circle-rpm7/rpm-headers/systemd/sd-id128.h rename to .ci-builders/centos7-base/rpm-headers/systemd/sd-id128.h diff --git a/.ci-builders/runner7-circle-rpm7/rpm-headers/systemd/sd-journal.h b/.ci-builders/centos7-base/rpm-headers/systemd/sd-journal.h similarity index 100% rename from .ci-builders/runner7-circle-rpm7/rpm-headers/systemd/sd-journal.h rename to .ci-builders/centos7-base/rpm-headers/systemd/sd-journal.h diff --git a/.ci-builders/runner7-gitlab-rpm7/Dockerfile b/.ci-builders/centos7/Dockerfile similarity index 95% rename from .ci-builders/runner7-gitlab-rpm7/Dockerfile rename to .ci-builders/centos7/Dockerfile index 730e5d01831bde..3f6171e12ad628 100644 --- a/.ci-builders/runner7-gitlab-rpm7/Dockerfile +++ b/.ci-builders/centos7/Dockerfile @@ -1,5 +1,5 @@ -ARG BASE_RUNNER_IMAGE_VERSION=centos7_latest -FROM docker.io/stackstate/stackstate-agent-runner-circle:${BASE_RUNNER_IMAGE_VERSION} +ARG BASE_IMAGE=centos7_latest +FROM docker.io/stackstate/stackstate-agent-runner-circle:${BASE_IMAGE} # force update root certificates, in particular might return DST Root CA X3 RUN yum -y update ca-certificates && yum -y reinstall ca-certificates diff --git a/.ci-builders/runner7-gitlab-rpm7/Makefile b/.ci-builders/centos7/Makefile similarity index 52% rename from .ci-builders/runner7-gitlab-rpm7/Makefile rename to .ci-builders/centos7/Makefile index 411b68f188e621..616095ba1c2b7d 100644 --- a/.ci-builders/runner7-gitlab-rpm7/Makefile +++ b/.ci-builders/centos7/Makefile @@ -1,12 +1,12 @@ RUNTIMETAG := $(shell date +%Y%m%d) DOCKER_REPOSITORY ?= docker.io -BASE_RUNNER_IMAGE_VERSION ?= centos7_latest +BASE_IMAGE ?= centos7_latest version: echo $(RUNTIMETAG) | tail -1 > version.txt build: - docker build --build-arg BASE_RUNNER_IMAGE_VERSION=$(BASE_RUNNER_IMAGE_VERSION) -t $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:centos7_$(RUNTIMETAG) . + docker build --build-arg BASE_IMAGE=$(BASE_IMAGE) -t $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:centos7_$(RUNTIMETAG) . push: docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:centos7_$(RUNTIMETAG) diff --git a/.ci-builders/runner7-gitlab-rpm7/Readme.md b/.ci-builders/centos7/Readme.md similarity index 100% rename from .ci-builders/runner7-gitlab-rpm7/Readme.md rename to .ci-builders/centos7/Readme.md diff --git a/.ci-builders/runner7-circle-deb/rpmmacros b/.ci-builders/centos7/rpmmacros similarity index 100% rename from .ci-builders/runner7-circle-deb/rpmmacros rename to .ci-builders/centos7/rpmmacros diff --git a/.ci-builders/runner7-circle-deb/Dockerfile b/.ci-builders/debian-base/Dockerfile similarity index 100% rename from .ci-builders/runner7-circle-deb/Dockerfile rename to .ci-builders/debian-base/Dockerfile diff --git a/.ci-builders/runner7-circle-deb/Makefile b/.ci-builders/debian-base/Makefile similarity index 100% rename from .ci-builders/runner7-circle-deb/Makefile rename to .ci-builders/debian-base/Makefile diff --git a/.ci-builders/runner7-circle-rpm7/conda.sh b/.ci-builders/debian-base/conda.sh similarity index 100% rename from .ci-builders/runner7-circle-rpm7/conda.sh rename to .ci-builders/debian-base/conda.sh diff --git a/.ci-builders/runner7-circle-deb/entrypoint.sh b/.ci-builders/debian-base/entrypoint.sh similarity index 100% rename from .ci-builders/runner7-circle-deb/entrypoint.sh rename to .ci-builders/debian-base/entrypoint.sh diff --git a/.ci-builders/runner7-circle-deb/gobin.sh b/.ci-builders/debian-base/gobin.sh similarity index 100% rename from .ci-builders/runner7-circle-deb/gobin.sh rename to .ci-builders/debian-base/gobin.sh diff --git a/.ci-builders/runner7-circle-deb/mqlicense.sh b/.ci-builders/debian-base/mqlicense.sh similarity index 100% rename from .ci-builders/runner7-circle-deb/mqlicense.sh rename to .ci-builders/debian-base/mqlicense.sh diff --git a/.ci-builders/runner7-gitlab-deb-rpmpublisher/rpmmacros b/.ci-builders/debian-base/rpmmacros similarity index 100% rename from .ci-builders/runner7-gitlab-deb-rpmpublisher/rpmmacros rename to .ci-builders/debian-base/rpmmacros diff --git a/.ci-builders/runner7-circle-rpm/rvm/gpg-keys/mpapis.asc b/.ci-builders/debian-base/rvm/gpg-keys/mpapis.asc similarity index 100% rename from .ci-builders/runner7-circle-rpm/rvm/gpg-keys/mpapis.asc rename to .ci-builders/debian-base/rvm/gpg-keys/mpapis.asc diff --git a/.ci-builders/runner7-circle-rpm/rvm/gpg-keys/pkuczynski.asc b/.ci-builders/debian-base/rvm/gpg-keys/pkuczynski.asc similarity index 100% rename from .ci-builders/runner7-circle-rpm/rvm/gpg-keys/pkuczynski.asc rename to .ci-builders/debian-base/rvm/gpg-keys/pkuczynski.asc diff --git a/.ci-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile b/.ci-builders/debian-rpmpublisher/Dockerfile similarity index 67% rename from .ci-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile rename to .ci-builders/debian-rpmpublisher/Dockerfile index 23c784a7d5ab5c..9638d80b721940 100644 --- a/.ci-builders/runner7-gitlab-deb-rpmpublisher/Dockerfile +++ b/.ci-builders/debian-rpmpublisher/Dockerfile @@ -1,5 +1,5 @@ -ARG BASE_RUNNER_IMAGE_VERSION=python:3.10.4-slim-buster -FROM docker.io/${BASE_RUNNER_IMAGE_VERSION} +ARG BASE_IMAGE=python:3.10.4-slim-buster +FROM docker.io/${BASE_IMAGE} RUN pip install boto3 sts-rpm-s3==0.3.3 invoke distro==1.4.0 awscli==1.16 RUN apt update && apt-get install -y libkrb5-dev unixodbc-dev rpm python-deltarpm createrepo yum-utils diff --git a/.ci-builders/debian-rpmpublisher/Makefile b/.ci-builders/debian-rpmpublisher/Makefile new file mode 100644 index 00000000000000..b91fffd266bf96 --- /dev/null +++ b/.ci-builders/debian-rpmpublisher/Makefile @@ -0,0 +1,8 @@ +RUNTIMETAG := $(shell date +%Y%m%d) +DOCKER_REPOSITORY ?= docker.io +BASE_IMAGE ?= deb7_latest + +build: + docker build --build-arg BASE_IMAGE=$(BASE_IMAGE) -t $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_$(RUNTIMETAG) . +push: + docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_$(RUNTIMETAG) diff --git a/.ci-builders/runner7-gitlab-rpm7/rpmmacros b/.ci-builders/debian-rpmpublisher/rpmmacros similarity index 100% rename from .ci-builders/runner7-gitlab-rpm7/rpmmacros rename to .ci-builders/debian-rpmpublisher/rpmmacros diff --git a/.ci-builders/runner7-gitlab-deb/Dockerfile b/.ci-builders/debian/Dockerfile similarity index 93% rename from .ci-builders/runner7-gitlab-deb/Dockerfile rename to .ci-builders/debian/Dockerfile index 6fe137c4aaa026..57de0a736a7b69 100644 --- a/.ci-builders/runner7-gitlab-deb/Dockerfile +++ b/.ci-builders/debian/Dockerfile @@ -1,5 +1,5 @@ -ARG BASE_RUNNER_IMAGE_VERSION=deb7_latest -FROM docker.io/stackstate/stackstate-agent-runner-circle:${BASE_RUNNER_IMAGE_VERSION} +ARG BASE_IMAGE=deb7_latest +FROM docker.io/stackstate/stackstate-agent-runner-circle:${BASE_IMAGE} RUN DEBIAN_FRONTEND=noninteractive apt-get install -y nano libtool-bin libelf-dev gnupg2 locales RUN echo 'export PATH=$HOME/bin:$PATH' >> /root/.bashrc diff --git a/.ci-builders/runner7-gitlab-deb/Makefile b/.ci-builders/debian/Makefile similarity index 61% rename from .ci-builders/runner7-gitlab-deb/Makefile rename to .ci-builders/debian/Makefile index 7a7b1f8b67f3ce..fe624317f8a4cd 100644 --- a/.ci-builders/runner7-gitlab-deb/Makefile +++ b/.ci-builders/debian/Makefile @@ -1,12 +1,12 @@ RUNTIMETAG := $(shell date +%Y%m%d) DOCKER_REPOSITORY ?= docker.io -BASE_RUNNER_IMAGE_VERSION ?= deb7_latest +BASE_IMAGE ?= deb7_latest version: echo $(RUNTIMETAG) | tail -1 > version.txt build: - docker build --build-arg BASE_RUNNER_IMAGE_VERSION=$(BASE_RUNNER_IMAGE_VERSION) -t $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb7_$(RUNTIMETAG) . + docker build --build-arg BASE_IMAGE=$(BASE_IMAGE) -t $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb7_$(RUNTIMETAG) . try: docker run -it $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb7_$(RUNTIMETAG) bash push: diff --git a/.ci-builders/runner7-gitlab-deb/rpmmacros b/.ci-builders/debian/rpmmacros similarity index 100% rename from .ci-builders/runner7-gitlab-deb/rpmmacros rename to .ci-builders/debian/rpmmacros diff --git a/.ci-builders/runner7-gitlab-deb-rpmpublisher/Makefile b/.ci-builders/runner7-gitlab-deb-rpmpublisher/Makefile deleted file mode 100644 index e12da2ad1b3be4..00000000000000 --- a/.ci-builders/runner7-gitlab-deb-rpmpublisher/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -RUNTIMETAG := $(shell date +%Y%m%d) -DOCKER_REPOSITORY ?= docker.io -BASE_RUNNER_IMAGE_VERSION ?= deb7_latest - -build: - docker build --build-arg BASE_RUNNER_IMAGE_VERSION=$(BASE_RUNNER_IMAGE_VERSION) -t $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_$(RUNTIMETAG) . -push: - docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_$(RUNTIMETAG) diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index 88e199d519f4ce..6b29ce72dbf2dc 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -4,12 +4,12 @@ stages: variables: BUILDERS_FOLDER: $CI_PROJECT_DIR/.ci-builders - RUNNER_DEB_BASE: $BUILDERS_FOLDER/runner7-circle-deb - RUNNER_DEB: $BUILDERS_FOLDER/runner7-gitlab-deb - RUNNER_DEB_RPM_PUBLISHER: $BUILDERS_FOLDER/runner7-gitlab-deb-rpmpublisher - RUNNER_CENTOS6_BASE: $BUILDERS_FOLDER/runner7-circle-rpm - RUNNER_CENTOS7_BASE: $BUILDERS_FOLDER/runner7-circle-rpm7 - RUNNER_CENTOS7: $BUILDERS_FOLDER/runner7-gitlab-rpm7 + RUNNER_DEBIAN_BASE: debian-base + RUNNER_DEBIAN: debian + RUNNER_DEBIAN_RPM_PUBLISHER: debian-rpmpublisher + RUNNER_CENTOS6_BASE: centos6-base + RUNNER_CENTOS7_BASE: centos7-base + RUNNER_CENTOS7: centos7 DOCKER_REGISTRY: docker.io QUAY_REGISTRY: quay.io DOCKER_DRIVER: overlay @@ -42,13 +42,13 @@ before_script: ################################################################################## # BUILD IMAGES BASE FOR DEB + RPM ################################################################################# -.docker_build_runner_base: &docker_build_runner_base +.build_runner_base: &build_runner_base <<: *docker_build_base stage: build_runner_base script: - - cd $RUNNER_DIR + - cd $BUILDERS_FOLDER/$RUNNER_DIR # build the base image - - BUILD_TAG="stackstate-agent-runner-circle:${BASE_RUNNER_IMAGE_VERSION}_$(date +%Y%m%d)" + - BUILD_TAG="stackstate-agent-runner-gitlab:${$RUNNER_DIR}-$(date +%Y%m%d)" - docker build -t "${BUILD_TAG}" . # tag the image, push to docker - DOCKER_TAG="${DOCKER_REGISTRY}/stackstate/${BUILD_TAG}" @@ -58,45 +58,45 @@ before_script: # - QUAY_TAG="${QUAY_REGISTRY}/stackstate/${BUILD_TAG}" # - docker tag "${BUILD_TAG}" "${DOCKER_TAG}" # - docker push "${QUAY_TAG}" + - echo "BASE_RUNNER_TAG=$BUILD_TAG" >> build.env + artifacts: + reports: + dotenv: build.env -# produces the base deb image: quay.io/stackstate/stackstate-agent-runner-circle:deb7_{yyyymmdd} -build-deb-base: - <<: *docker_build_runner_base +# produces the base deb image: quay.io/stackstate/stackstate-agent-runner-gitlab:deb7_{yyyymmdd} +build-debian-base: + <<: *build_runner_base stage: build_runner_base variables: - RUNNER_DIR: $RUNNER_DEB_BASE - BASE_RUNNER_IMAGE_VERSION: "deb7" + RUNNER_DIR: $RUNNER_DEBIAN_BASE # TODO: centos6 is EOL. This might potentially work: https://arstech.net/centos-6-error-yumrepo-error-all-mirror-urls-are-not-using-ftp-http/ # TODO: skipping it for now -# produces the base rpm image: quay.io/stackstate/stackstate-agent-runner-circle:centos6_{yyyymmdd} +# produces the base rpm image: quay.io/stackstate/stackstate-agent-runner-gitlab:centos6_{yyyymmdd} #build-centos6-base: # <<: *docker_build_runner_base # variables: # RUNNER_DIR: $RUNNER_CENTOS6_BASE -# BASE_RUNNER_IMAGE_VERSION: "centos6" +# BASE_IMAGE: "centos6" -# produces the base rpm image: quay.io/stackstate/stackstate-agent-runner-circle:centos7_{yyyymmdd} +# produces the base rpm image: quay.io/stackstate/stackstate-agent-runner-gitlab:centos7_{yyyymmdd} build-centos7-base: - <<: *docker_build_runner_base + <<: *build_runner_base variables: RUNNER_DIR: $RUNNER_CENTOS7_BASE - BASE_RUNNER_IMAGE_VERSION: "centos7" ################################################################################## # BUILD RUNNER IMAGES FROM BASE IMAGE ################################################################################# -.docker_build_runner: &docker_build_runner +.build_runner: &build_runner <<: *docker_build_base stage: build_runners script: - - cd $RUNNER_DIR + - cd $BUILDERS_FOLDER/$RUNNER_DIR # get the current date as the base image version - - BASE_RUNNER_DATED_IMAGE_VERSION="${BASE_RUNNER_IMAGE_VERSION}_$(date +%Y%m%d)" - - echo Using deb base container version $BASE_RUNNER_DATED_IMAGE_VERSION - - BUILD_TAG="stackstate-agent-runner-gitlab:${RUNNER_IMAGE_VERSION}_$(date +%Y%m%d)" - - docker build --build-arg BASE_RUNNER_IMAGE_VERSION=$BASE_RUNNER_DATED_IMAGE_VERSION -t "${BUILD_TAG}" . + - BUILD_TAG="stackstate-agent-runner-gitlab:${RUNNER_DIR}-$(date +%Y%m%d)" + - docker build --build-arg BASE_IMAGE=$BASE_IMAGE -t "${BUILD_TAG}" . # tag the image, push to docker - DOCKER_TAG="${DOCKER_REGISTRY}/stackstate/${BUILD_TAG}" - docker tag "${BUILD_TAG}" "${DOCKER_TAG}" @@ -108,30 +108,30 @@ build-centos7-base: # produces the runner deb image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb7_{yyyymmdd} -build-main-deb-runner: - <<: *docker_build_runner - needs: [ build-deb-base ] +build-debian-runner: + <<: *build_runner + needs: [ build-debian-base ] variables: - RUNNER_DIR: $RUNNER_DEB + RUNNER_DIR: $RUNNER_DEBIAN RUNNER_IMAGE_VERSION: "deb7" - BASE_RUNNER_IMAGE_VERSION: "deb7" + BASE_IMAGE: $BASE_RUNNER_TAG # produces the runner deb/rpm publisher image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_{yyyymmdd} -build-deb-rpm-publisher-runner: - <<: *docker_build_runner +build-debian-rpmpublisher-runner: + <<: *build_runner variables: - RUNNER_DIR: $RUNNER_DEB_RPM_PUBLISHER + RUNNER_DIR: RUNNER_DEBIAN_RPM_PUBLISHER RUNNER_IMAGE_VERSION: "deb-rpmpublisher" - BASE_RUNNER_IMAGE_VERSION: "python:3.10.4-slim-buster" + BASE_IMAGE: "python:3.10.4-slim-buster" # produces the runner centos 7 image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7_20211004_v7_0 build-centos7-runner: - <<: *docker_build_runner + <<: *build_runner needs: [ build-centos7-base ] variables: RUNNER_DIR: $RUNNER_CENTOS7 RUNNER_IMAGE_VERSION: "centos7" - BASE_RUNNER_IMAGE_VERSION: "centos7" + BASE_IMAGE: "centos7" # TODO: centos6 is EOL. This might potentially work: https://arstech.net/centos-6-error-yumrepo-error-all-mirror-urls-are-not-using-ftp-http/ # TODO: skipping it for now From d247daa71eaf76e2f9a2a16b807db5529f1746cd Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Wed, 4 May 2022 14:27:07 +0200 Subject: [PATCH 61/81] STAC-15134 Fix base runner script --- .gitlab-ci-build-runners.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index 6b29ce72dbf2dc..9aa869a2ce744a 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -48,7 +48,7 @@ before_script: script: - cd $BUILDERS_FOLDER/$RUNNER_DIR # build the base image - - BUILD_TAG="stackstate-agent-runner-gitlab:${$RUNNER_DIR}-$(date +%Y%m%d)" + - BUILD_TAG="stackstate-agent-runner-gitlab:${RUNNER_DIR}-$(date +%Y%m%d)" - docker build -t "${BUILD_TAG}" . # tag the image, push to docker - DOCKER_TAG="${DOCKER_REGISTRY}/stackstate/${BUILD_TAG}" From aedfb6b8a43b2988274bb8857fe924263e0acd21 Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Wed, 4 May 2022 15:13:10 +0200 Subject: [PATCH 62/81] STAC-15134 Fix BASE_RUNNER_TAG [build_runners] --- .ci-builders/centos6-base/Makefile | 8 ++++---- .ci-builders/centos7-base/Makefile | 8 ++++---- .ci-builders/centos7/Dockerfile | 2 +- .ci-builders/centos7/Makefile | 2 +- .ci-builders/debian-base/Makefile | 12 ++++++------ .ci-builders/debian/Dockerfile | 2 +- .ci-builders/runner-circle-deb/Makefile | 8 ++++---- .ci-builders/runner-circle-rpm/Makefile | 4 ++-- .ci-builders/runner-gitlab-deb/Dockerfile | 2 +- .ci-builders/runner-gitlab-rpm/Dockerfile | 2 +- .ci-builders/runner7-circle-win/Makefile | 8 ++++---- .ci-builders/runner7-gitlab-rpm/Dockerfile | 2 +- .gitlab-ci-build-runners.yml | 18 ++++++++++++------ 13 files changed, 42 insertions(+), 36 deletions(-) diff --git a/.ci-builders/centos6-base/Makefile b/.ci-builders/centos6-base/Makefile index 2265d3bd624e25..c9773c643684a0 100644 --- a/.ci-builders/centos6-base/Makefile +++ b/.ci-builders/centos6-base/Makefile @@ -6,13 +6,13 @@ version: build: - docker build -t $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:centos6_$(RUNTIMETAG) . + docker build -t $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:centos6_$(RUNTIMETAG) . push: - docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:centos6_$(RUNTIMETAG) + docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:centos6_$(RUNTIMETAG) tag_latest: - docker tag $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:centos6_$(RUNTIMETAG) $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:centos6_latest + docker tag $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:centos6_$(RUNTIMETAG) $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:centos6_latest push_latest: - docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:centos6_latest + docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:centos6_latest diff --git a/.ci-builders/centos7-base/Makefile b/.ci-builders/centos7-base/Makefile index f1d3fd8c85d8c7..7b9694fed3334f 100644 --- a/.ci-builders/centos7-base/Makefile +++ b/.ci-builders/centos7-base/Makefile @@ -5,14 +5,14 @@ version: echo $(RUNTIMETAG) | tail -1 > version.txt build: - docker build -t $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:centos7_$(RUNTIMETAG) . + docker build -t $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:centos7_$(RUNTIMETAG) . push: - docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:centos7_$(RUNTIMETAG) + docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:centos7_$(RUNTIMETAG) tag_latest: - docker tag $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:centos7_$(RUNTIMETAG) $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:centos7_latest + docker tag $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:centos7_$(RUNTIMETAG) $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:centos7_latest push_latest: - docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:centos7_latest + docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:centos7_latest diff --git a/.ci-builders/centos7/Dockerfile b/.ci-builders/centos7/Dockerfile index 3f6171e12ad628..a46420ad352d24 100644 --- a/.ci-builders/centos7/Dockerfile +++ b/.ci-builders/centos7/Dockerfile @@ -1,5 +1,5 @@ ARG BASE_IMAGE=centos7_latest -FROM docker.io/stackstate/stackstate-agent-runner-circle:${BASE_IMAGE} +FROM docker.io/stackstate/stackstate-agent-runner-gitlab:${BASE_IMAGE} # force update root certificates, in particular might return DST Root CA X3 RUN yum -y update ca-certificates && yum -y reinstall ca-certificates diff --git a/.ci-builders/centos7/Makefile b/.ci-builders/centos7/Makefile index 616095ba1c2b7d..e9453a1c480643 100644 --- a/.ci-builders/centos7/Makefile +++ b/.ci-builders/centos7/Makefile @@ -9,4 +9,4 @@ build: docker build --build-arg BASE_IMAGE=$(BASE_IMAGE) -t $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:centos7_$(RUNTIMETAG) . push: - docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:centos7_$(RUNTIMETAG) + docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:centos7_$(RUNTIMETAG) diff --git a/.ci-builders/debian-base/Makefile b/.ci-builders/debian-base/Makefile index eeec100fb6e838..4a112085c90ff6 100644 --- a/.ci-builders/debian-base/Makefile +++ b/.ci-builders/debian-base/Makefile @@ -5,19 +5,19 @@ version: echo $(RUNTIMETAG) | tail -1 > version.txt build: - docker build -t $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:deb7_$(RUNTIMETAG) . + docker build -t $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb7_$(RUNTIMETAG) . tag: - docker tag $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:deb7_$(RUNTIMETAG) $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:deb7_$(RUNTIMETAG) + docker tag $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb7_$(RUNTIMETAG) $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb7_$(RUNTIMETAG) push: - docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:deb7_$(RUNTIMETAG) + docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb7_$(RUNTIMETAG) try: - docker run -it $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:deb7_$(RUNTIMETAG) sh + docker run -it $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb7_$(RUNTIMETAG) sh tag_latest: - docker tag $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:deb7_$(RUNTIMETAG) $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:deb7_latest + docker tag $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb7_$(RUNTIMETAG) $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb7_latest push_latest: - docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:deb7_latest + docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb7_latest diff --git a/.ci-builders/debian/Dockerfile b/.ci-builders/debian/Dockerfile index 57de0a736a7b69..d7690bde7c8ee5 100644 --- a/.ci-builders/debian/Dockerfile +++ b/.ci-builders/debian/Dockerfile @@ -1,5 +1,5 @@ ARG BASE_IMAGE=deb7_latest -FROM docker.io/stackstate/stackstate-agent-runner-circle:${BASE_IMAGE} +FROM docker.io/stackstate/stackstate-agent-runner-gitlab:${BASE_IMAGE} RUN DEBIAN_FRONTEND=noninteractive apt-get install -y nano libtool-bin libelf-dev gnupg2 locales RUN echo 'export PATH=$HOME/bin:$PATH' >> /root/.bashrc diff --git a/.ci-builders/runner-circle-deb/Makefile b/.ci-builders/runner-circle-deb/Makefile index c99c69c2f8e63d..8ca65b5ea592a8 100644 --- a/.ci-builders/runner-circle-deb/Makefile +++ b/.ci-builders/runner-circle-deb/Makefile @@ -2,12 +2,12 @@ RUNTIMETAG := $(shell date +%Y%m%d) DOCKER_REPOSITORY ?= docker.io build: - docker build -t $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:deb_$(RUNTIMETAG) . + docker build -t $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb_$(RUNTIMETAG) . push: - docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:deb_$(RUNTIMETAG) + docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb_$(RUNTIMETAG) tag_latest: - docker tag $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:deb_$(RUNTIMETAG) $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:deb_latest + docker tag $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb_$(RUNTIMETAG) $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb_latest push_latest: - docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-circle:deb_latest + docker push $(DOCKER_REPOSITORY)/stackstate/stackstate-agent-runner-gitlab:deb_latest diff --git a/.ci-builders/runner-circle-rpm/Makefile b/.ci-builders/runner-circle-rpm/Makefile index 6ae4dc083f9b16..3833704f5f7fab 100644 --- a/.ci-builders/runner-circle-rpm/Makefile +++ b/.ci-builders/runner-circle-rpm/Makefile @@ -1,5 +1,5 @@ build: - docker build -t docker.io/stackstate/stackstate-agent-runner-circle:centos6 . + docker build -t docker.io/stackstate/stackstate-agent-runner-gitlab:centos6 . push: - docker push docker.io/stackstate/stackstate-agent-runner-circle:centos6 + docker push docker.io/stackstate/stackstate-agent-runner-gitlab:centos6 diff --git a/.ci-builders/runner-gitlab-deb/Dockerfile b/.ci-builders/runner-gitlab-deb/Dockerfile index f715d1e86e0990..d5d3db73b38543 100644 --- a/.ci-builders/runner-gitlab-deb/Dockerfile +++ b/.ci-builders/runner-gitlab-deb/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/stackstate/stackstate-agent-runner-circle:latest +FROM docker.io/stackstate/stackstate-agent-runner-gitlab:latest RUN pip install awscli boto3 sts-rpm-s3 #RUN apt-get install -y libkrb5-dev unixodbc-dev rpm python-deltarpm createrepo yum-utils diff --git a/.ci-builders/runner-gitlab-rpm/Dockerfile b/.ci-builders/runner-gitlab-rpm/Dockerfile index 49cbe0771f5739..b373c1fa554498 100644 --- a/.ci-builders/runner-gitlab-rpm/Dockerfile +++ b/.ci-builders/runner-gitlab-rpm/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/stackstate/stackstate-agent-runner-circle:centos6 +FROM docker.io/stackstate/stackstate-agent-runner-gitlab:centos6 RUN pip install awscli boto3 sts-rpm-s3 diff --git a/.ci-builders/runner7-circle-win/Makefile b/.ci-builders/runner7-circle-win/Makefile index e776d28880cb78..1a333548c69836 100644 --- a/.ci-builders/runner7-circle-win/Makefile +++ b/.ci-builders/runner7-circle-win/Makefile @@ -1,13 +1,13 @@ RUNTIMETAG := $(shell date +%Y%m%d) build: - docker build -t docker.io/stackstate/stackstate-agent-runner-circle:win_$(RUNTIMETAG) . + docker build -t docker.io/stackstate/stackstate-agent-runner-gitlab:win_$(RUNTIMETAG) . push: - docker push docker.io/stackstate/stackstate-agent-runner-circle:win_$(RUNTIMETAG) + docker push docker.io/stackstate/stackstate-agent-runner-gitlab:win_$(RUNTIMETAG) tag_latest: - docker tag docker.io/stackstate/stackstate-agent-runner-circle:win_$(RUNTIMETAG) docker.io/stackstate/stackstate-agent-runner-circle:win_latest + docker tag docker.io/stackstate/stackstate-agent-runner-gitlab:win_$(RUNTIMETAG) docker.io/stackstate/stackstate-agent-runner-gitlab:win_latest push_latest: - docker push docker.io/stackstate/stackstate-agent-runner-circle:win_latest + docker push docker.io/stackstate/stackstate-agent-runner-gitlab:win_latest diff --git a/.ci-builders/runner7-gitlab-rpm/Dockerfile b/.ci-builders/runner7-gitlab-rpm/Dockerfile index 9955b952c0b779..9340096d6866c8 100644 --- a/.ci-builders/runner7-gitlab-rpm/Dockerfile +++ b/.ci-builders/runner7-gitlab-rpm/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/stackstate/stackstate-agent-runner-circle:centos6_latest_v7 +FROM docker.io/stackstate/stackstate-agent-runner-gitlab:centos6_latest_v7 #workaround diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index 9aa869a2ce744a..365e27e77c36c2 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -48,7 +48,8 @@ before_script: script: - cd $BUILDERS_FOLDER/$RUNNER_DIR # build the base image - - BUILD_TAG="stackstate-agent-runner-gitlab:${RUNNER_DIR}-$(date +%Y%m%d)" + - BASE_RUNNER_TAG="${RUNNER_DIR}-$(date +%Y%m%d)" + - BUILD_TAG="stackstate-agent-runner-gitlab:${BASE_RUNNER_TAG}" - docker build -t "${BUILD_TAG}" . # tag the image, push to docker - DOCKER_TAG="${DOCKER_REGISTRY}/stackstate/${BUILD_TAG}" @@ -58,7 +59,7 @@ before_script: # - QUAY_TAG="${QUAY_REGISTRY}/stackstate/${BUILD_TAG}" # - docker tag "${BUILD_TAG}" "${DOCKER_TAG}" # - docker push "${QUAY_TAG}" - - echo "BASE_RUNNER_TAG=$BUILD_TAG" >> build.env + - echo "BASE_RUNNER_TAG=$BASE_RUNNER_TAG" >> build.env artifacts: reports: dotenv: build.env @@ -105,12 +106,16 @@ build-centos7-base: # - QUAY_TAG="${QUAY_REGISTRY}/stackstate/${BUILD_TAG}" # - docker tag "${BUILD_TAG}" "${DOCKER_TAG}" # - docker push "${QUAY_TAG}" + rules: + - if: $CI_COMMIT_MESSAGE + when: always # produces the runner deb image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb7_{yyyymmdd} build-debian-runner: <<: *build_runner - needs: [ build-debian-base ] + needs: + - build-debian-base variables: RUNNER_DIR: $RUNNER_DEBIAN RUNNER_IMAGE_VERSION: "deb7" @@ -120,18 +125,19 @@ build-debian-runner: build-debian-rpmpublisher-runner: <<: *build_runner variables: - RUNNER_DIR: RUNNER_DEBIAN_RPM_PUBLISHER + RUNNER_DIR: $RUNNER_DEBIAN_RPM_PUBLISHER RUNNER_IMAGE_VERSION: "deb-rpmpublisher" BASE_IMAGE: "python:3.10.4-slim-buster" # produces the runner centos 7 image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7_20211004_v7_0 build-centos7-runner: <<: *build_runner - needs: [ build-centos7-base ] + needs: + - build-centos7-base variables: RUNNER_DIR: $RUNNER_CENTOS7 RUNNER_IMAGE_VERSION: "centos7" - BASE_IMAGE: "centos7" + BASE_IMAGE: $BASE_RUNNER_TAG # TODO: centos6 is EOL. This might potentially work: https://arstech.net/centos-6-error-yumrepo-error-all-mirror-urls-are-not-using-ftp-http/ # TODO: skipping it for now From 77fa6540767f04eb0303e5bea13d573538f89ea5 Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Wed, 4 May 2022 15:20:19 +0200 Subject: [PATCH 63/81] STAC-15134 Fix build_runner [build_runners] --- .gitlab-ci-build-runners.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index 365e27e77c36c2..e7db9bbd3c3927 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -108,7 +108,7 @@ build-centos7-base: # - docker push "${QUAY_TAG}" rules: - if: $CI_COMMIT_MESSAGE - when: always + when: on_success # produces the runner deb image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb7_{yyyymmdd} From 93893511ec36fb020950b79ca60522e5e39ccff2 Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Wed, 4 May 2022 15:36:55 +0200 Subject: [PATCH 64/81] STAC-15134 Debug error --- .gitlab-ci-build-runners.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index e7db9bbd3c3927..0ff2dcaccdc533 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -94,10 +94,12 @@ build-centos7-base: <<: *docker_build_base stage: build_runners script: + - echo $BASE_IMAGE + - echo $BASE_RUNNER_TAG - cd $BUILDERS_FOLDER/$RUNNER_DIR # get the current date as the base image version - BUILD_TAG="stackstate-agent-runner-gitlab:${RUNNER_DIR}-$(date +%Y%m%d)" - - docker build --build-arg BASE_IMAGE=$BASE_IMAGE -t "${BUILD_TAG}" . + - docker build --build-arg BASE_IMAGE=$BASE_RUNNER_TAG -t "${BUILD_TAG}" . # tag the image, push to docker - DOCKER_TAG="${DOCKER_REGISTRY}/stackstate/${BUILD_TAG}" - docker tag "${BUILD_TAG}" "${DOCKER_TAG}" From 322fd0cacf04e215f912a538baa31b7b3d79f7f6 Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Wed, 4 May 2022 17:30:30 +0200 Subject: [PATCH 65/81] STAC-15134 Debug BASE_RUNNER_TAG --- .gitlab-ci-build-runners.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index 0ff2dcaccdc533..9148bd6cfb719e 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -49,16 +49,17 @@ before_script: - cd $BUILDERS_FOLDER/$RUNNER_DIR # build the base image - BASE_RUNNER_TAG="${RUNNER_DIR}-$(date +%Y%m%d)" - - BUILD_TAG="stackstate-agent-runner-gitlab:${BASE_RUNNER_TAG}" - - docker build -t "${BUILD_TAG}" . - # tag the image, push to docker - - DOCKER_TAG="${DOCKER_REGISTRY}/stackstate/${BUILD_TAG}" - - docker tag "${BUILD_TAG}" "${DOCKER_TAG}" - - docker push "${DOCKER_TAG}" +#DEBUG - BUILD_TAG="stackstate-agent-runner-gitlab:${BASE_RUNNER_TAG}" +#DEBUG - docker build -t "${BUILD_TAG}" . +#DEBUG # tag the image, push to docker +#DEBUG - DOCKER_TAG="${DOCKER_REGISTRY}/stackstate/${BUILD_TAG}" +#DEBUG - docker tag "${BUILD_TAG}" "${DOCKER_TAG}" +#DEBUG - docker push "${DOCKER_TAG}" # tag the image, push to quay # - QUAY_TAG="${QUAY_REGISTRY}/stackstate/${BUILD_TAG}" # - docker tag "${BUILD_TAG}" "${DOCKER_TAG}" # - docker push "${QUAY_TAG}" + - echo "BASE_RUNNER_TAG=$BASE_RUNNER_TAG" - echo "BASE_RUNNER_TAG=$BASE_RUNNER_TAG" >> build.env artifacts: reports: @@ -94,8 +95,8 @@ build-centos7-base: <<: *docker_build_base stage: build_runners script: - - echo $BASE_IMAGE - - echo $BASE_RUNNER_TAG + - echo "$BASE_IMAGE" + - echo "$BASE_RUNNER_TAG" - cd $BUILDERS_FOLDER/$RUNNER_DIR # get the current date as the base image version - BUILD_TAG="stackstate-agent-runner-gitlab:${RUNNER_DIR}-$(date +%Y%m%d)" From 82c0469a8d69ff95a6c1b61a919786a258ba2096 Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Wed, 4 May 2022 17:49:40 +0200 Subject: [PATCH 66/81] STAC-15134 Debug BASE_RUNNER_TAG [2] --- .gitlab-ci-build-runners.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index 9148bd6cfb719e..ce1fc7d5802246 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -60,7 +60,7 @@ before_script: # - docker tag "${BUILD_TAG}" "${DOCKER_TAG}" # - docker push "${QUAY_TAG}" - echo "BASE_RUNNER_TAG=$BASE_RUNNER_TAG" - - echo "BASE_RUNNER_TAG=$BASE_RUNNER_TAG" >> build.env + - echo "BASE_RUNNER_TAG=$BASE_RUNNER_TAG" >> $CI_PROJECT_DIR/build.env artifacts: reports: dotenv: build.env @@ -117,7 +117,7 @@ build-centos7-base: # produces the runner deb image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb7_{yyyymmdd} build-debian-runner: <<: *build_runner - needs: + dependencies: - build-debian-base variables: RUNNER_DIR: $RUNNER_DEBIAN @@ -135,7 +135,7 @@ build-debian-rpmpublisher-runner: # produces the runner centos 7 image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7_20211004_v7_0 build-centos7-runner: <<: *build_runner - needs: + dependencies: - build-centos7-base variables: RUNNER_DIR: $RUNNER_CENTOS7 From b8c81dc082529020a8cc150104873120cbe4400c Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Wed, 4 May 2022 17:55:21 +0200 Subject: [PATCH 67/81] STAC-15134 Debug BASE_RUNNER_TAG [3] --- .gitlab-ci-build-runners.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index ce1fc7d5802246..9f26af78558364 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -109,15 +109,12 @@ build-centos7-base: # - QUAY_TAG="${QUAY_REGISTRY}/stackstate/${BUILD_TAG}" # - docker tag "${BUILD_TAG}" "${DOCKER_TAG}" # - docker push "${QUAY_TAG}" - rules: - - if: $CI_COMMIT_MESSAGE - when: on_success # produces the runner deb image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb7_{yyyymmdd} build-debian-runner: <<: *build_runner - dependencies: + needs: - build-debian-base variables: RUNNER_DIR: $RUNNER_DEBIAN @@ -135,7 +132,7 @@ build-debian-rpmpublisher-runner: # produces the runner centos 7 image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7_20211004_v7_0 build-centos7-runner: <<: *build_runner - dependencies: + needs: - build-centos7-base variables: RUNNER_DIR: $RUNNER_CENTOS7 From 42628362c5ab04dd88df4dc4de41771a3ec919a3 Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Wed, 4 May 2022 18:33:32 +0200 Subject: [PATCH 68/81] STAC-15134 Full build --- .gitlab-ci-build-runners.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index 9f26af78558364..4b24dca00e91cc 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -49,12 +49,12 @@ before_script: - cd $BUILDERS_FOLDER/$RUNNER_DIR # build the base image - BASE_RUNNER_TAG="${RUNNER_DIR}-$(date +%Y%m%d)" -#DEBUG - BUILD_TAG="stackstate-agent-runner-gitlab:${BASE_RUNNER_TAG}" -#DEBUG - docker build -t "${BUILD_TAG}" . -#DEBUG # tag the image, push to docker -#DEBUG - DOCKER_TAG="${DOCKER_REGISTRY}/stackstate/${BUILD_TAG}" -#DEBUG - docker tag "${BUILD_TAG}" "${DOCKER_TAG}" -#DEBUG - docker push "${DOCKER_TAG}" + - BUILD_TAG="stackstate-agent-runner-gitlab:${BASE_RUNNER_TAG}" + - docker build -t "${BUILD_TAG}" . + # tag the image, push to docker + - DOCKER_TAG="${DOCKER_REGISTRY}/stackstate/${BUILD_TAG}" + - docker tag "${BUILD_TAG}" "${DOCKER_TAG}" + - docker push "${DOCKER_TAG}" # tag the image, push to quay # - QUAY_TAG="${QUAY_REGISTRY}/stackstate/${BUILD_TAG}" # - docker tag "${BUILD_TAG}" "${DOCKER_TAG}" @@ -95,8 +95,6 @@ build-centos7-base: <<: *docker_build_base stage: build_runners script: - - echo "$BASE_IMAGE" - - echo "$BASE_RUNNER_TAG" - cd $BUILDERS_FOLDER/$RUNNER_DIR # get the current date as the base image version - BUILD_TAG="stackstate-agent-runner-gitlab:${RUNNER_DIR}-$(date +%Y%m%d)" @@ -109,6 +107,9 @@ build-centos7-base: # - QUAY_TAG="${QUAY_REGISTRY}/stackstate/${BUILD_TAG}" # - docker tag "${BUILD_TAG}" "${DOCKER_TAG}" # - docker push "${QUAY_TAG}" + rules: + - if: $CI_COMMIT_MESSAGE + when: on_success # produces the runner deb image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb7_{yyyymmdd} @@ -119,7 +120,6 @@ build-debian-runner: variables: RUNNER_DIR: $RUNNER_DEBIAN RUNNER_IMAGE_VERSION: "deb7" - BASE_IMAGE: $BASE_RUNNER_TAG # produces the runner deb/rpm publisher image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_{yyyymmdd} build-debian-rpmpublisher-runner: @@ -137,7 +137,6 @@ build-centos7-runner: variables: RUNNER_DIR: $RUNNER_CENTOS7 RUNNER_IMAGE_VERSION: "centos7" - BASE_IMAGE: $BASE_RUNNER_TAG # TODO: centos6 is EOL. This might potentially work: https://arstech.net/centos-6-error-yumrepo-error-all-mirror-urls-are-not-using-ftp-http/ # TODO: skipping it for now From e92d72dad3091b5b447c6a511c6315b3c961ae13 Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Wed, 4 May 2022 18:37:20 +0200 Subject: [PATCH 69/81] STAC-15134 Fix debian-rpmpublisher-runner --- .gitlab-ci-build-runners.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index 4b24dca00e91cc..0896bdfab063d9 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -127,7 +127,7 @@ build-debian-rpmpublisher-runner: variables: RUNNER_DIR: $RUNNER_DEBIAN_RPM_PUBLISHER RUNNER_IMAGE_VERSION: "deb-rpmpublisher" - BASE_IMAGE: "python:3.10.4-slim-buster" + BASE_RUNNER_TAG: "python:3.10.4-slim-buster" # produces the runner centos 7 image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7_20211004_v7_0 build-centos7-runner: From 019acf59a7af5c8d1969a6e6357328079a295a70 Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Wed, 4 May 2022 18:54:06 +0200 Subject: [PATCH 70/81] STAC-15134 Update images --- .gitlab-ci-agent.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci-agent.yml b/.gitlab-ci-agent.yml index cc356675c42fb9..878c38cbb3036f 100644 --- a/.gitlab-ci-agent.yml +++ b/.gitlab-ci-agent.yml @@ -1,4 +1,4 @@ -image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb7_20211210 +image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:debian-20220504 stages: - prepare @@ -96,7 +96,7 @@ deps_deb: deps_rpm: stage: prepare interruptible: true - image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7_20211210 + image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7-20220504 cache: key: "deps-rpm-$STS_VER-$CI_COMMIT_REF_SLUG" paths: @@ -315,7 +315,7 @@ build_deb: build_rpm: stage: build interruptible: true - image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7_20211210 + image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7-20220504 needs: - deps_rpm tags: @@ -429,7 +429,7 @@ test_deb_renaming: test_rpm_renaming: stage: test interruptible: true - image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7_20211210 + image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7-20220504 needs: - build_rpm before_script: [] @@ -500,7 +500,7 @@ pre_release_win: pre_release_rpm: stage: pre_release interruptible: true - image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_20220107 + image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:debian-rpmpublisher-20220504 needs: - build_rpm before_script: [] @@ -1324,7 +1324,7 @@ release_deb: release_rpm: interruptible: true stage: release - image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_20220107 + image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:debian-rpmpublisher-20220504 dependencies: - build_rpm before_script: From 09c6be0c03e628580f59bbabde072a6d25304f66 Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Thu, 5 May 2022 09:46:37 +0200 Subject: [PATCH 71/81] STAC-15134 Add lexicon to debian and gpg to rpmpublisher --- .ci-builders/debian-base/Dockerfile | 8 ++++---- .ci-builders/debian-rpmpublisher/Dockerfile | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.ci-builders/debian-base/Dockerfile b/.ci-builders/debian-base/Dockerfile index 5c60edfa30fdef..d424e320cbfb5f 100644 --- a/.ci-builders/debian-base/Dockerfile +++ b/.ci-builders/debian-base/Dockerfile @@ -102,17 +102,17 @@ RUN conda init bash RUN conda create -n ddpy2 python python=2 RUN conda create -n ddpy3 python python=3.8 -# Update pip, setuptools and misc deps +# Update pip, setuptools and misc deps for ddpy2 RUN /bin/bash -c "source /root/.bashrc && conda activate ddpy2 \ && pip install -i https://pypi.python.org/simple pip==${DD_PIP_VERSION} \ && pip install --ignore-installed setuptools==${DD_SETUPTOOLS_VERSION} \ - && pip install invoke distro==1.4.0 awscli==1.16.240" + && pip install invoke distro==1.4.0 awscli==1.16.240 lexicon" -# Update pip, setuptools and misc deps +# Update pip, setuptools and misc deps for ddpy3 RUN /bin/bash -c "source /root/.bashrc && conda activate ddpy3 \ && pip install -i https://pypi.python.org/simple pip==${DD_PIP_VERSION} \ && pip install --ignore-installed setuptools==${DD_SETUPTOOLS_VERSION} \ - && pip install invoke distro==1.4.0 awscli==1.16.240" + && pip install invoke distro==1.4.0 awscli==1.16.240 lexicon" # [VS] not needed if we base on GO base image. # Gimme diff --git a/.ci-builders/debian-rpmpublisher/Dockerfile b/.ci-builders/debian-rpmpublisher/Dockerfile index 9638d80b721940..ecf267692285b8 100644 --- a/.ci-builders/debian-rpmpublisher/Dockerfile +++ b/.ci-builders/debian-rpmpublisher/Dockerfile @@ -2,7 +2,7 @@ ARG BASE_IMAGE=python:3.10.4-slim-buster FROM docker.io/${BASE_IMAGE} RUN pip install boto3 sts-rpm-s3==0.3.3 invoke distro==1.4.0 awscli==1.16 -RUN apt update && apt-get install -y libkrb5-dev unixodbc-dev rpm python-deltarpm createrepo yum-utils +RUN apt update && apt-get install -y libkrb5-dev unixodbc-dev rpm python-deltarpm createrepo yum-utils gnupg2 ADD rpmmacros /root/.rpmmacros From 1e727ea048f6a45b789c065d88cd8d452d9f1943 Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Thu, 5 May 2022 10:13:12 +0200 Subject: [PATCH 72/81] STAC-15134 Update rpmpublisher and debian images [build_runners] --- .gitlab-ci-agent.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci-agent.yml b/.gitlab-ci-agent.yml index 878c38cbb3036f..3e994b531a3d1f 100644 --- a/.gitlab-ci-agent.yml +++ b/.gitlab-ci-agent.yml @@ -1,4 +1,4 @@ -image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:debian-20220504 +image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:debian-20220505 stages: - prepare @@ -500,7 +500,7 @@ pre_release_win: pre_release_rpm: stage: pre_release interruptible: true - image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:debian-rpmpublisher-20220504 + image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:debian-rpmpublisher-20220505 needs: - build_rpm before_script: [] From 1d11bcf68073ed4f3490856873d8930c07d3e3c0 Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Thu, 5 May 2022 10:21:21 +0200 Subject: [PATCH 73/81] STAC-15134 Add lexicon to centos7 [build_runners] --- .ci-builders/centos6-base/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci-builders/centos6-base/Dockerfile b/.ci-builders/centos6-base/Dockerfile index 1a836e248e80a4..4d2204d004e3d7 100644 --- a/.ci-builders/centos6-base/Dockerfile +++ b/.ci-builders/centos6-base/Dockerfile @@ -90,13 +90,13 @@ RUN conda init bash RUN source /root/.bashrc && conda activate ddpy2 \ && pip install -i https://pypi.python.org/simple pip==${DD_PIP_VERSION} \ && pip install --ignore-installed setuptools==${DD_SETUPTOOLS_VERSION} \ - && pip install invoke distro==1.4.0 awscli==1.16.240 + && pip install invoke distro==1.4.0 awscli==1.16.240 lexicon # Update pip, setuptools and misc deps RUN source /root/.bashrc && conda activate ddpy3 \ && pip install -i https://pypi.python.org/simple pip==${DD_PIP_VERSION} \ && pip install --ignore-installed setuptools==${DD_SETUPTOOLS_VERSION} \ - && pip install invoke distro==1.4.0 awscli==1.16.240 + && pip install invoke distro==1.4.0 awscli==1.16.240 lexicon # Add systemd headers COPY ./rpm-headers/systemd /usr/include/systemd From 16e8fce139110502be7c69174c7e762d8a706e25 Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Thu, 5 May 2022 11:34:17 +0200 Subject: [PATCH 74/81] STAC-15134 Fix sign_rpm_package.sh [build_runners] --- .gitlab-ci-agent.yml | 2 +- .gitlab-ci-build-runners.yml | 6 +++++- omnibus/package-scripts/sign_rpm_package.sh | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci-agent.yml b/.gitlab-ci-agent.yml index 3e994b531a3d1f..a4562236ea8f7f 100644 --- a/.gitlab-ci-agent.yml +++ b/.gitlab-ci-agent.yml @@ -1324,7 +1324,7 @@ release_deb: release_rpm: interruptible: true stage: release - image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:debian-rpmpublisher-20220504 + image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:debian-rpmpublisher-20220505 dependencies: - build_rpm before_script: diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index 0896bdfab063d9..3584a194127180 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -30,7 +30,6 @@ before_script: retry: max: 2 when: - # TODO: figure out what causes flakiness in the docker builds, sometimes pulling fails on builder the image or the base image is not available yet for the runner to pull - always rules: - if: $CI_COMMIT_MESSAGE =~ /\[build_runners]/ @@ -64,6 +63,11 @@ before_script: artifacts: reports: dotenv: build.env + rules: + - if: $CI_COMMIT_MESSAGE + when: manual + - if: $CI_COMMIT_MESSAGE =~ /\[build_runners]/ + when: always # produces the base deb image: quay.io/stackstate/stackstate-agent-runner-gitlab:deb7_{yyyymmdd} build-debian-base: diff --git a/omnibus/package-scripts/sign_rpm_package.sh b/omnibus/package-scripts/sign_rpm_package.sh index f591598e0fb87d..af431573f55e3d 100755 --- a/omnibus/package-scripts/sign_rpm_package.sh +++ b/omnibus/package-scripts/sign_rpm_package.sh @@ -30,6 +30,8 @@ python -mplatform | grep -qi debian && gpg-connect-agent RELOADAGENT /bye python -mplatform | grep -qi debian && export GPPPATH=/usr/lib/gnupg2 +python -mplatform | grep -q Linux && export GPPPATH=/usr/lib/gnupg2 + echo "$SIGNING_PUBLIC_KEY" | gpg --import echo "$SIGNING_PRIVATE_KEY" > gpg_private.key From 87cca7f0dd15a8f9e305a5657e122e4c7a676f86 Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Thu, 5 May 2022 12:40:07 +0200 Subject: [PATCH 75/81] STAC-15134 Use constant for rpmpublisher --- .ci-builders/debian-rpmpublisher/Dockerfile | 3 +-- .gitlab-ci-build-runners.yml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.ci-builders/debian-rpmpublisher/Dockerfile b/.ci-builders/debian-rpmpublisher/Dockerfile index ecf267692285b8..88b2120a32f2b7 100644 --- a/.ci-builders/debian-rpmpublisher/Dockerfile +++ b/.ci-builders/debian-rpmpublisher/Dockerfile @@ -1,5 +1,4 @@ -ARG BASE_IMAGE=python:3.10.4-slim-buster -FROM docker.io/${BASE_IMAGE} +FROM docker.io/python:3.10.4-slim-buster RUN pip install boto3 sts-rpm-s3==0.3.3 invoke distro==1.4.0 awscli==1.16 RUN apt update && apt-get install -y libkrb5-dev unixodbc-dev rpm python-deltarpm createrepo yum-utils gnupg2 diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index 3584a194127180..ae4d552de2ca5c 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -127,11 +127,10 @@ build-debian-runner: # produces the runner deb/rpm publisher image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher_{yyyymmdd} build-debian-rpmpublisher-runner: - <<: *build_runner + <<: *build_runner_base variables: RUNNER_DIR: $RUNNER_DEBIAN_RPM_PUBLISHER RUNNER_IMAGE_VERSION: "deb-rpmpublisher" - BASE_RUNNER_TAG: "python:3.10.4-slim-buster" # produces the runner centos 7 image: artifactory.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7_20211004_v7_0 build-centos7-runner: From 30394f0b1445279419ba87eae03302967bf75f55 Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Thu, 5 May 2022 13:25:48 +0200 Subject: [PATCH 76/81] STAC-15134 update centos7 image and push to quay.io --- .gitlab-ci-agent.yml | 6 +++--- .gitlab-ci-build-runners.yml | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci-agent.yml b/.gitlab-ci-agent.yml index a4562236ea8f7f..38add798f09034 100644 --- a/.gitlab-ci-agent.yml +++ b/.gitlab-ci-agent.yml @@ -96,7 +96,7 @@ deps_deb: deps_rpm: stage: prepare interruptible: true - image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7-20220504 + image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7-20220505 cache: key: "deps-rpm-$STS_VER-$CI_COMMIT_REF_SLUG" paths: @@ -315,7 +315,7 @@ build_deb: build_rpm: stage: build interruptible: true - image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7-20220504 + image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7-20220505 needs: - deps_rpm tags: @@ -429,7 +429,7 @@ test_deb_renaming: test_rpm_renaming: stage: test interruptible: true - image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7-20220504 + image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7-20220505 needs: - build_rpm before_script: [] diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index ae4d552de2ca5c..98b3b1689278c0 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -54,10 +54,10 @@ before_script: - DOCKER_TAG="${DOCKER_REGISTRY}/stackstate/${BUILD_TAG}" - docker tag "${BUILD_TAG}" "${DOCKER_TAG}" - docker push "${DOCKER_TAG}" - # tag the image, push to quay -# - QUAY_TAG="${QUAY_REGISTRY}/stackstate/${BUILD_TAG}" -# - docker tag "${BUILD_TAG}" "${DOCKER_TAG}" -# - docker push "${QUAY_TAG}" + # tag the image, push to quay + - QUAY_TAG="${QUAY_REGISTRY}/stackstate/${BUILD_TAG}" + - docker tag "${BUILD_TAG}" "${DOCKER_TAG}" + - docker push "${QUAY_TAG}" - echo "BASE_RUNNER_TAG=$BASE_RUNNER_TAG" - echo "BASE_RUNNER_TAG=$BASE_RUNNER_TAG" >> $CI_PROJECT_DIR/build.env artifacts: @@ -108,9 +108,9 @@ build-centos7-base: - docker tag "${BUILD_TAG}" "${DOCKER_TAG}" - docker push "${DOCKER_TAG}" # tag the image, push to quay -# - QUAY_TAG="${QUAY_REGISTRY}/stackstate/${BUILD_TAG}" -# - docker tag "${BUILD_TAG}" "${DOCKER_TAG}" -# - docker push "${QUAY_TAG}" + - QUAY_TAG="${QUAY_REGISTRY}/stackstate/${BUILD_TAG}" + - docker tag "${BUILD_TAG}" "${DOCKER_TAG}" + - docker push "${QUAY_TAG}" rules: - if: $CI_COMMIT_MESSAGE when: on_success From 73c8cec67056a6ee11828e198e1be2c9d89466e3 Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Thu, 5 May 2022 13:33:30 +0200 Subject: [PATCH 77/81] STAC-15134 Add lexicon to centos7 [build_runners] --- .ci-builders/centos7-base/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci-builders/centos7-base/Dockerfile b/.ci-builders/centos7-base/Dockerfile index dccbc3b7faf38d..63b09ddca4e6f9 100644 --- a/.ci-builders/centos7-base/Dockerfile +++ b/.ci-builders/centos7-base/Dockerfile @@ -104,13 +104,13 @@ RUN conda init bash RUN source /root/.bashrc && conda activate ddpy2 \ && pip install -i https://pypi.python.org/simple pip==${DD_PIP_VERSION} \ && pip install --ignore-installed setuptools==${DD_SETUPTOOLS_VERSION} \ - && pip install invoke distro==1.4.0 awscli==1.16.240 + && pip install invoke distro==1.4.0 awscli==1.16.240 lexicon # Update pip, setuptools and misc deps RUN source /root/.bashrc && conda activate ddpy3 \ && pip install -i https://pypi.python.org/simple pip==${DD_PIP_VERSION} \ && pip install --ignore-installed setuptools==${DD_SETUPTOOLS_VERSION} \ - && pip install invoke distro==1.4.0 awscli==1.16.240 + && pip install invoke distro==1.4.0 awscli==1.16.240 lexicon # Add systemd headers COPY ./rpm-headers/systemd /usr/include/systemd From 020010d68f55cd52559bd0f425df2bf3bb833035 Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Thu, 5 May 2022 14:12:31 +0200 Subject: [PATCH 78/81] STAC-15134 Attempt to use centos7 image to release_rpm [build_runners] --- .gitlab-ci-agent.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci-agent.yml b/.gitlab-ci-agent.yml index 38add798f09034..57ae0206d699dd 100644 --- a/.gitlab-ci-agent.yml +++ b/.gitlab-ci-agent.yml @@ -500,7 +500,7 @@ pre_release_win: pre_release_rpm: stage: pre_release interruptible: true - image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:debian-rpmpublisher-20220505 + image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7-20220505 needs: - build_rpm before_script: [] @@ -1324,7 +1324,7 @@ release_deb: release_rpm: interruptible: true stage: release - image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:debian-rpmpublisher-20220505 + image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7-20220505 dependencies: - build_rpm before_script: From 6f817c2a68cf7cba9a0dcbde7f5c97e2ebcef241 Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Thu, 5 May 2022 15:32:12 +0200 Subject: [PATCH 79/81] STAC-15134 Fix quay.io push and use previous release_rpm image [build_runners] --- .gitlab-ci-agent.yml | 4 ++-- .gitlab-ci-build-runners.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci-agent.yml b/.gitlab-ci-agent.yml index 57ae0206d699dd..6bebefff4af956 100644 --- a/.gitlab-ci-agent.yml +++ b/.gitlab-ci-agent.yml @@ -500,7 +500,7 @@ pre_release_win: pre_release_rpm: stage: pre_release interruptible: true - image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7-20220505 + image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher needs: - build_rpm before_script: [] @@ -1324,7 +1324,7 @@ release_deb: release_rpm: interruptible: true stage: release - image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:centos7-20220505 + image: artifactory.tooling.stackstate.io/docker-virtual/stackstate/stackstate-agent-runner-gitlab:deb-rpmpublisher dependencies: - build_rpm before_script: diff --git a/.gitlab-ci-build-runners.yml b/.gitlab-ci-build-runners.yml index 98b3b1689278c0..95c44b7cf8704b 100644 --- a/.gitlab-ci-build-runners.yml +++ b/.gitlab-ci-build-runners.yml @@ -56,7 +56,7 @@ before_script: - docker push "${DOCKER_TAG}" # tag the image, push to quay - QUAY_TAG="${QUAY_REGISTRY}/stackstate/${BUILD_TAG}" - - docker tag "${BUILD_TAG}" "${DOCKER_TAG}" + - docker tag "${BUILD_TAG}" "${QUAY_TAG}" - docker push "${QUAY_TAG}" - echo "BASE_RUNNER_TAG=$BASE_RUNNER_TAG" - echo "BASE_RUNNER_TAG=$BASE_RUNNER_TAG" >> $CI_PROJECT_DIR/build.env @@ -109,7 +109,7 @@ build-centos7-base: - docker push "${DOCKER_TAG}" # tag the image, push to quay - QUAY_TAG="${QUAY_REGISTRY}/stackstate/${BUILD_TAG}" - - docker tag "${BUILD_TAG}" "${DOCKER_TAG}" + - docker tag "${BUILD_TAG}" "${QUAY_TAG}" - docker push "${QUAY_TAG}" rules: - if: $CI_COMMIT_MESSAGE From 74b8d372c5a53cf91e93ab54a73cddbd5d3e0bff Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Fri, 6 May 2022 14:17:15 +0200 Subject: [PATCH 80/81] STAC-15134 Version pin pip deps --- .ci-builders/centos6-base/Dockerfile | 4 +- .ci-builders/centos7-base/Dockerfile | 6 +- .ci-builders/debian-base/Dockerfile | 6 +- .../debian-base/rvm/gpg-keys/mpapis.asc | 580 ------------------ .../debian-base/rvm/gpg-keys/pkuczynski.asc | 51 -- .ci-builders/debian-rpmpublisher/Dockerfile | 2 +- .ci-builders/debian/Dockerfile | 1 - .ci-builders/runner-circle-deb/Dockerfile | 2 +- .ci-builders/runner-circle-rpm/Dockerfile | 2 +- .ci-builders/runner-gitlab-deb/Dockerfile | 2 +- .ci-builders/runner-gitlab-rpm/Dockerfile | 2 +- .ci-builders/runner7-gitlab-rpm/Dockerfile | 2 +- 12 files changed, 13 insertions(+), 647 deletions(-) delete mode 100644 .ci-builders/debian-base/rvm/gpg-keys/mpapis.asc delete mode 100644 .ci-builders/debian-base/rvm/gpg-keys/pkuczynski.asc diff --git a/.ci-builders/centos6-base/Dockerfile b/.ci-builders/centos6-base/Dockerfile index 4d2204d004e3d7..f71479d1319d47 100644 --- a/.ci-builders/centos6-base/Dockerfile +++ b/.ci-builders/centos6-base/Dockerfile @@ -90,13 +90,13 @@ RUN conda init bash RUN source /root/.bashrc && conda activate ddpy2 \ && pip install -i https://pypi.python.org/simple pip==${DD_PIP_VERSION} \ && pip install --ignore-installed setuptools==${DD_SETUPTOOLS_VERSION} \ - && pip install invoke distro==1.4.0 awscli==1.16.240 lexicon + && pip install invoke==1.7.0 distro==1.4.0 awscli==1.16.240 lexicon==2.0.1 # Update pip, setuptools and misc deps RUN source /root/.bashrc && conda activate ddpy3 \ && pip install -i https://pypi.python.org/simple pip==${DD_PIP_VERSION} \ && pip install --ignore-installed setuptools==${DD_SETUPTOOLS_VERSION} \ - && pip install invoke distro==1.4.0 awscli==1.16.240 lexicon + && pip install invoke==1.7.0 distro==1.4.0 awscli==1.16.240 lexicon==2.0.1 # Add systemd headers COPY ./rpm-headers/systemd /usr/include/systemd diff --git a/.ci-builders/centos7-base/Dockerfile b/.ci-builders/centos7-base/Dockerfile index 63b09ddca4e6f9..e5aed18d1f2668 100644 --- a/.ci-builders/centos7-base/Dockerfile +++ b/.ci-builders/centos7-base/Dockerfile @@ -104,13 +104,13 @@ RUN conda init bash RUN source /root/.bashrc && conda activate ddpy2 \ && pip install -i https://pypi.python.org/simple pip==${DD_PIP_VERSION} \ && pip install --ignore-installed setuptools==${DD_SETUPTOOLS_VERSION} \ - && pip install invoke distro==1.4.0 awscli==1.16.240 lexicon + && pip install invoke==1.7.0 distro==1.4.0 awscli==1.16.240 lexicon==2.0.1 # Update pip, setuptools and misc deps RUN source /root/.bashrc && conda activate ddpy3 \ && pip install -i https://pypi.python.org/simple pip==${DD_PIP_VERSION} \ && pip install --ignore-installed setuptools==${DD_SETUPTOOLS_VERSION} \ - && pip install invoke distro==1.4.0 awscli==1.16.240 lexicon + && pip install invoke==1.7.0 distro==1.4.0 awscli==1.16.240 lexicon==2.0.1 # Add systemd headers COPY ./rpm-headers/systemd /usr/include/systemd @@ -157,7 +157,7 @@ RUN mkdir -p /go/src/github.com/DataDog/datadog-agent # Force umask to 0022 RUN echo "umask 0022" >> /root/.bashrc -RUN pip install awscli boto3 sts-rpm-s3 +RUN pip install awscli==1.16 boto3==1.22.7 sts-rpm-s3==0.3.3 RUN yum -y install net-snmp-devel python-deltarpm yum-utils libtool rpm-sign createrepo diff --git a/.ci-builders/debian-base/Dockerfile b/.ci-builders/debian-base/Dockerfile index d424e320cbfb5f..2e5ca7f80ef589 100644 --- a/.ci-builders/debian-base/Dockerfile +++ b/.ci-builders/debian-base/Dockerfile @@ -106,13 +106,13 @@ RUN conda create -n ddpy3 python python=3.8 RUN /bin/bash -c "source /root/.bashrc && conda activate ddpy2 \ && pip install -i https://pypi.python.org/simple pip==${DD_PIP_VERSION} \ && pip install --ignore-installed setuptools==${DD_SETUPTOOLS_VERSION} \ - && pip install invoke distro==1.4.0 awscli==1.16.240 lexicon" + && pip install invoke==1.7.0 distro==1.4.0 awscli==1.16.240 lexicon==2.0.1" # Update pip, setuptools and misc deps for ddpy3 RUN /bin/bash -c "source /root/.bashrc && conda activate ddpy3 \ && pip install -i https://pypi.python.org/simple pip==${DD_PIP_VERSION} \ && pip install --ignore-installed setuptools==${DD_SETUPTOOLS_VERSION} \ - && pip install invoke distro==1.4.0 awscli==1.16.240 lexicon" + && pip install invoke==1.7.0 distro==1.4.0 awscli==1.16.240 lexicon==2.0.1" # [VS] not needed if we base on GO base image. # Gimme @@ -167,8 +167,6 @@ RUN apt-get install -y apt-utils libtool && apt-get install -y --only-upgrade li # For some tests RUN apt-get install sudo -# TODO: to be moved to conda virtualenvs -#RUN pip install awscli boto3 sts-rpm-s3 ADD rpmmacros /root/.rpmmacros # yum-utils #https://pkgs.org/download/yum-utils #RUN apt-get install -y libkrb5-dev unixodbc-dev rpm python-deltarpm createrepo bison yum-utils diff --git a/.ci-builders/debian-base/rvm/gpg-keys/mpapis.asc b/.ci-builders/debian-base/rvm/gpg-keys/mpapis.asc deleted file mode 100644 index 02a36a29b5f04b..00000000000000 --- a/.ci-builders/debian-base/rvm/gpg-keys/mpapis.asc +++ /dev/null @@ -1,580 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2 - -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 -8wvlb9/is1iN7h7+s2GDPpvEJrrnpeHeNTX1BEeykvbjW+Bsb89g6kJfks7PvhD+ -BQwVMaNrmjR8KYi+GaopHdQ30yLWD4ck97B+UYZnqSKk7E8NOpwU22b31VlZgI/J -XWeXgQ5cY58J0ShGmbfypHXerthzlm6UHzjg6g+yujqDrxaOPTdfxYAzJmX5ztk3 -D9xMEhCAD8ypefTdMGQb0B2q5Yjsl3sHqNNqxTeg1iorUNz6UtEhX3RmGrTDdY0r -gn0prjgiMTEMWWxAmgeYw/gOkpWfEZNrX64La65OkhTg+aBZEe6broHrc1x6dXpo -RkxGJrlRfcsxOcgy2M0/C0gk1L1yYWXRL4yENkQ/hNuPZmdDtrvWxcSTnMPfclwq -6kklflC099ujCZf5NuOG80mZi03917LQBtgWp4INmG+B6aLY52KuINmWXm25wYPY -5MfEbyO2KzngJSpxdR90GbP4F5lri2Ho9eSByisb0dLq0ugBEAABAQAAAAAAAAAA -AAAAAP/Y/+AAEEpGSUYAAQEBAGAAYAAA/+EAQEV4aWYAAElJKgAIAAAAAQBphwQA -AQAAABoAAAAAAAAAAgACoAkAAQAAAJ8AAAADoAkAAQAAAJ8AAAAAAAAA/9sAQwAI -BgYHBgUIBwcHCQkICgwUDQwLCwwZEhMPFB0aHx4dGhwcICQuJyAiLCMcHCg3KSww -MTQ0NB8nOT04MjwuMzQy/9sAQwEJCQkMCwwYDQ0YMiEcITIyMjIyMjIyMjIyMjIy -MjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy/8AAEQgAnwCfAwEi -AAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIB -AwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNi -coIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0 -dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfI -ycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEA -AAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYS -QVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpD -REVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZ -mqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz -9PX29/j5+v/aAAwDAQACEQMRAD8A9YFKTzRikxikSLTutMpw6UAKBRxQc9qOaYCe -1I2BznisHX/FdnoSFW/fXH/PNT0+p7V5J4k8calrExRZXgg/55xEgd+vrWsKTlqc -dXGQjLljqz2TUvEekaTj7ZfRIx/hzk/kKoQ+PvDMzhBqiBiM/MrAfnjFfP085kIB -YsR+NN+6gYnB7YrT2MTH63U3PoR/HXhqPJ/tSM4/uqx/kKt6d4p0TU5PLtNSheT+ -6x2n8jivnaJgY8k80hlYEccU/YR7krGVL7H1CCGGVII9jTq+crDxXqWkSIba8lXB -4Utkfka9C8O/Fe3vJEt9Xg8h+nnpypPuO1ZyotbanRTxal8SseldTQRmo4Z47iJZ -InV42GQynINS8isTrTuJ04oNGaSgYn1opN3PSlwKAHGlptLSAMYpRSHmkBzQA+qe -rX8emafLdSZwo4x69qtj61w/xGvzHawWcbcsDI/8h/WtqMOeaRy4ys6VFyW55V4n -vp7jUZHMpO87ic9c1iIk0gOwE+tdr4Z8HXPia482bKWqHBf19q9V0/wHo9lEgFsr -Mv8AEwrerVjB2OHC4WpOmrfefP8AHpV4SCsTE4yRtNWf7DvPL3NA+BzX0eugWIx+ -4TI74qZ9EtGTaYUwO2Kw+sdkdf1CT3kfNqac8Iw8Lg9uKryQYypVlr6Kn8L2MnWF -fxFYOqeB7O4B8uMBs5qvrK6oyeW1L3TPBpok5yeRUEbmE9Rkd69UvvhqzZMbY9hX -I6v4Lv8AT4jIIyyDrgU41oN6Ml4erFe8tDX+H/jT+xrs2d27NaTsOevln1r28HIy -Dwa+UlLRTLkYIPIr6D8AazJq/htDK+6aBvLY47dv0pVVdcyNcNPll7N9djqqPwop -CawO8UYopM4pRQIWiikpDFopKUelAB0ryzxFu1vxXNDGSwVxGMdgOD+ua9L1C7Fn -p9xcn/llGWH1xxXE+DLLdI91McyO3X1rswz5IyqM8jMr1alOguup3Oj2EWnadFbx -IFCqK0Vf3qGPg1IUJrz27u579OKhFRRMHWnF6r7HHSj5h1oTG0Pds1A4ycU4saru -zFj1pNlJCPtHXFUrm2hnQo6Ag9sVM6uxpqoQcv0HSsy2lY8Y+IHhRdLuRe2qfuZD -yAOhrY+EN7i5v7Jj96MSAfQ4/rXceJLOPUNJnikGRtJFeYeCQ+keO7dTxHKWj9sE -cfrivRo3nSZ4OJ5aWJX3ntxNBGaM8ZNJmsDvCnA4ppOBSr05oAdTSCehp3egdaQw -xx0oXmlPNC0wMLxZNjQZEx991UjPXnP9Ki0O2ECxLtClVHA6CtTV7VJbINMuUVw2 -fTFRWbots04OVY8EelaSqpUeVHFDDOWN9pLayNiLnGasBgvU15hqHj+5hvJYoIY/ -KQkBt3LYrNl+J8qEHy2Udw1cXOj2eRs9kDrTXkQ8V5Rb/E5JpY02qV43EHmuj03x -TFqJAjbLdcU/aIapNnYYQ0AR461zF/rn2Ncvwvqax5/H1raMqyc5HJz0o50ynSaV -2d40aYzVW4jGw4rjofHkFzIRGvy4zuLDApZPH1hFtWSVMdCcjj8qTkibNGnqEhWF -0znjpXmN0wtdbimG4NFKGBHsc1341O21NfMgkDoRwVrz3WAU1p1zzu/Wu/AT1cTw -88pe7Gouh7WrCRFdfusAacR6CobLIsLcHIPlr/Kpj3rJ7nbB3imwwB9aKO2KXoKQ -x1Hc0gIYceuKWkMOcUo6UtJmmBkTXEpa8t5OYyxMftwOK4qHWdQ/tk+Gm067gtS7 -bbwblV1CltoOOpxjg5xn611mr3xi1G3tkUEyuAfp3P5Vb+yC4lt5N20wymQDHXKM -uP8Ax7P4Vzc28TtlT1U32PLdU2WDymS0Z33HYqpkmuZvdbv4wG/sdVB7OCT+QHvX -vN5o0Nyd20Bx0OKxbvw/MxwGVvrGP51Cunqa2jJaOx4zBdedKgn06FHk5Uxg5/nX -Z+GUe01GHbbzziVWIiUqGGMc/MQMc+ueldInhFFkEsuxSDkAKM1P4Q0Ce38VX15P -K8sUOUi3LgLuwcD6KF5/2qe7B+6tDO8ZTzHSXdtMvoQAMtI0RA+u1yf0ry65mtkY -LKkszdBtcpn+dfQ/jSx+3+HLy1jQGWSFlQ4744rynTvC8l7plvcNHHM7rnDDBA7c -+uOvvVNKLJi3NJHBrqOnLN5UunzhunMpbH4VejXTr1SYUYEdU3kGu0HhJGfJ0rcw -PJ4B/OpY/BCmUObVYMHs2c1LmuhSptblLQZzpukvcxu6wQHdLHJhsL/EQQBjA579 -KNOvNN1rVxfKfPV5QsaEFAAoyzH17cV1FxoUdvpUttGgYTLtdW6FSQD+ma5u/sbK -zuo47OOK23KVCxqFGMjPArSnV5Nepz1sOqrUbXVz0fS/EEWqapLY28X7qCIM0o6E -5HArbzXIeCrQW816/UuEwfb/AD/Kuv8AerpNtXZGJjGNS0ULj1opKU1ocw6koIyK -O1IoXPpTQRmjgUnfNAjPvLZZLn7UOHhUqQR1zwCP1FS2uMBiakupl+zSRZAbg47n -msee++zoornlZM9GF5JXN8yM3AbH4Zqvc3HlIWecAe6isT+1gI8lv1rm9T1aXULl -bSBiWY4PPQVLqHRGjrrsdNb6gdVuzBby5C/eYDFdLZbEUAMCe5FcLL5uhacJLBVa -bbhgf4q5608Yana+ZLcxbWJ6K3H60ou24VIKXw6Hq+pS5Bwa4hL6bTdTMFzs8t+Y -ziuW1Xx7cy24SMNv9FNOsdRfV4A1zuAjGFz2z1olK+qHTgo6M9LimV0DbF6fwmkY -xsT8pP1ri9K1p7aT7PKxO3hTnqK15dXXH3qXPcbpW2J9VlKwMEAAx0FcZf2TXV7a -yIf3pymPbI5/nWzNqRugyL0xirVlYPd2jBGMZJwXA5x6Z7UlqZr3JHSeH4Fg01SC -DuOM+oHH+Nap6VBawJa2sVug+WNQoqftXalZWPKqS5pNhmgmkx6UgAzTIJc+tHem -5BpQBSGBBzxQaUUNTEUry3ilQyMgLoCVboRXNX6GTdt7jNdc3PBHFcs58u4eGTqr -FT/Q1z1kduFl0MDUDLHZkR5J6VDo1stvNvndPNbkjPSt94IyxRhlT61gatocl2ri -1uGtps/LItcy0Z36yVjqmCSxBcjkd/WuU1rRDJGTCAWHUKetYFnpWsRytb6pfTBl -YYmDfKQT+nFaz6C6Ws8qa0A8TEAhxjoCM+nWtHOzsxKCW7MgeHnRi0oXJPc1q2tv -FZQshdeTyB6VWvdDEflmbWkZmVmJMg5x6Vyk1hqt5dJDZTSRx/xSliM0lLmdinFd -DpLgGWTdG4BU8VYSSeS0VjkE0zR/D+x0SadpnH3nY9a3rm3iR44kXEaDpUS3Hdoz -7SNojljyeTXYaJpeokQyyzQrZkB1Vcl2zzg8YH61yrZmu44IgN0jBF+pOBXp8aLF -Eka/dQBR9BW9GF9WcGIquLshcYNO7Yph60ZJrqOAdnPamUo601zhc5xQMzBr1uf4 -Jf8Av2aUa/bZ+5N/3wa1/sdt6/8AjtIbK37MP++anUNDK/4SK1z9yb/vg0f8JFbY -+5L/AN8GtQ2lt/eH/fNH2W19R/3zR7waGWdetM5xJ/3waw9avIZblLmDcMjEgKkf -Q1132W1J+8P++ajubC0ntpYm2kMpHSpkm0aUp8srnGi7VwOOfWpoGLHGec1iBzDc -Pbt1UkCtiwAeZW3Ae2a5Op6qlbULqSNP9am0f3sZx9axbiXSjIPPt9Pdh/G2M/ka -66501LpfmyAay5PBtnMN0hbJ9MCrXMaxqxSOamm0wcW8dlFzyY1GT+VPtdkjZjTI -HG4962JPClpaNlGY5PGcVcisIbVBjkHnPtUyuVKomjOgH2bLSdevFZ9xeDc0h4z0 -qa/u1ZiiYxzXO311j5FOT0qLGLlc6HwxPbf219ru5VSOAEru7uen5DP6V3X/AAkO -l97yL86860W/utNgjEOlJqKPukmTftlAGOUzwT7e1auo+KNAis7W/wDskkljckqk -0aA7HHVHXghv5jmuum9LI83ERfNdnZf2/pZHF5Efxo/tzTyeLhPzrmtP1XwjehjH -qlmhHJE2Yv8A0IDP4Vv2lhpF/Hvs5rO4QdWikVgPyrT3jn0JxrNiy5NzGPbdzVS9 -1m1KMqXMYAwSxNW20Cz7RQ/pXP6vokC2o2qil5OCCPQ/4VMnKxUUrncKOelLt4zg -4p5ULGXLAAcmmWWoQ3UX7p1kGSMocim5paFxpSaG7Qe1IAOeBx19q8+1P4iz6H41 -udLvIEnsEx80I+dBgc8nB69OK868UeJv7X8R3M9rNcixmA8uOU4KnA3AgEjrmqV3 -sQ0k3c9e1nx5oWjlkNz9pmGcpb4bH1boKQeINSlhtoRbRQXlwqTSggt9ljb7qnP3 -pGAJ7BQDxxz4lpaR3Otabay48ua7iR8/3S4B/SvV9O1Rr/xNqCSqVddQus577QI1 -/JVrOu+SJvg6Ptajvsk39xW1m1InNxGPmzzVaC+dIhIjZI6jFdJdQhlYYzmuU1K0 -ls5TNBnbnkdjXIjs3RtWvi2AAo/GOoParra5HIg2uB3zmuDmFrdncy7JPbiq7LcR -f6ufIHTNXzMuMTurjXYoSWkmDccVzt/4qeZWSMfMRgAdhXPS+dJ/rZSaZujg6fM3 -rSuNouTXRVOSd3qaqW8bTzbjzzzSQwS3cnfHf2roLKyWJRxj8Km9hWHed/ZiWMyn -DLcA4/2cc/pXOpcJqGkeOIo8G1jmS8g9FbzduR9VYitDxBcqk6gt8sEZZh6f5xXO -aIxtvh94iumGPtlxb2iH1IJkb9APzrTDNuUjTMqSp4ei+ru/l0MMTFcZ65qzpN9e -6XqY1CzupYZwdo2twR6Edx7GswOS3TpVpD0Ga7zxD0bSvidqtoxGoJHeRMDycIwO -OMEDBH4VatPHEmsXCW17bwRIWLI6ZGMBuDk+9eY7y0p54UfmasRzHJANRNFQ0Z7h -ZfEfTF0aO8upM3EgwIFOSG7gj/PUV5/a+NbnSTqsWlBYILucyIp5MQPZfTtXFJIU -j445JpQ/7z681MaKW5rLEN7aE97eyzXstzM7SySYLs3U1UuPnlQLx8vFK53TAdiM -Uw5Gz/ZO2trWMG23dkkNzLDLHKh2zRsHQ+jA5Feoalr2n6bqlp4hiObK+ZbiTaPu -GQEP+T7vyryqYEHIPvXQeHbGLxHZPoctw0TyygW7kEhXYEqD7Ejn65rnxEOZL1O7 -L6nJKfnFnssdzDdwpNbyrJFINyuhyCKr3NsJoypGa8P0fxPq/hK8ltAweKNystvI -cruBwcEdD9P1r07QviFo+sFIJPNtrlv+WboWBPsR/XFc86UkOnWi9yvqGj/vGZFx -9DWHPbXUJIJYfUV6RcQJIm7gg9DWFd2KnPzY/Csrs6YtHEMs7NyGwfbFWrbT3lYF -hWldNY2AMl1NsX12k/yFYt3470mzBSzhluHHfGxfzPP6U0pS2QpVIx3Z1FrZrEg6 -ADtWN4g8X2ekK0Fsy3F50CKeFPuf6VxGqeMtV1MNGsgtoTxsi4J+p61labD5t/EX -5VTvOe+Oa1jRsryMfbe0moQ6nRaxdztZJC7mS6uCA+Op9f14q74q2aNpel+GEJ8y -yQ3N7/18SAEr/wABXaPzqbwv5MU974tv4/NtNJ2+RD/z0nY/uwfQA5Yn2FcleTz3 -11JcXEheeeQySuerMTkmtqMOWIsyxKr1vd+GOi9EJGmRn1qyPlGT2qNBgClkYCPH -rXQecKudnPU80/fsHqe9IKhmbFTLYqL1P//ZiQI3BBMBCAAhBQJYseahAhsDBQsJ -CAcCBhUICQoLAgQWAgMBAh4BAheAAAoJEDgEu4LTncDjYawP/0CafFAJq4OAlFl1 -bhb4BTiw3eAbRnifGpBUldTpxxp65UJyXtqA3wX3ggbhXMWnb5zMOh06HzVUFJ7S -nse3cxAHgi9+qqueBI53Zx1btPlJNX/AIv6TlESRMZJXE3y2pSBdmwW/tiXr5fC5 -RJqpgUevKfq3eW33aUtybE48FqmLqDJjyAvAbF/jKHY0Zahz7iCVkWJwufoGxkcI -MMLYh1R633DT2yDSti4xS8xKUYJsiiw2B2t//Ux6zoNh3gzBEeMoRDRFPuC3ibfd -kwC9zMkbDMNSMSlSB8F0sn52k93uQcnR1jWoWc5nSz9x5m1I3xo0Zl0I5YNIkDIN -z0SL426fN9zBSPHPnXsoOXOnDSF5xGt1Wzg3Do/kErFzlKPExqo5j+W5RbRznuZR -+uQw0nvCNGS3kfASbAaXR5lkb0VJiIliLM5HzXKi6W662y/XX5iQDkWx7UjjmTx5 -x7r12RYA6mwLJWlpNQoK4kWDlllUn1QpC+wqjTKePPMM/1vyqlh14tRVurxWTZPA -h6/2kzrb0a0noq4YBeCNjOU2Ri+1RXZJkthjn2eNsXEvLCp104H7W0uHwDAofiOk -X99T823H6dIUEllIyiX5DRyRimZYqC6ux5Qq8AKVJmAKY3+z61W+psmFqVXckSMu -8fd03DXvVgx60WWgGkGj8hEcoBe3uQINBFRQBC8BEADRTWbSpwvuyjGkPQxCsWs2 -df7qxEbj+NvzETDY7yeyWN49zll0zz1pCYZ11BtzCSiZWTLe9Ngk+PJsP4t87gZM -whNgG4YvIEJ9BIcpkPDCMvMyMW6Y8J0rPPjGrscLAPnIQg8VTZmsTGeEBUXsQNHF -igeBH/OL0Rwf4ydhUt4SfgldrcBCfS2EkJH4ULhUw5enhkfp5tt3k5l0C9Wa6+qW -YMEdhnN6rBjXGfwksgZAh2VfW7BNbidtuaCn8ZqrSf4p0kC3YdClW0wcDSGfT+Pp -OE04waycxUMB7gH8wvI8phcMSHj7rRJPui6rXytS14AI0BKinfXh0Tw9QwU6V8Cx -Wwq0/SFwcD10Q8Y7gDLfevzptKISpN05ACNSqCf1WmBZn63FWxk68r3JYrxFEYQv -VWHMAOQB1doODgrv+84xTxhcn781SAxA/F1BOtMgf/wgiUXUClxn7k4Cf27kLiZb -471SM8GTjoi5IVg7WyvN3p9wI6KWy7IrrvuwZKxXvr65Q3iDliVP1j0236PaBGJt -gznNhaHPyWkaDwBZW9MXQlejc+ixaeTceE9BqKvn+0Z1Dhx7WCzfBPgDkqSVLQP5 -O9kg9qjxkN2TkuQlWVVNJL+0reeQm7CSEyA5SjtZjOmnC9bcHDsnLlzPw8Qt9g9O -Ih8XUhr6inF3k6UrB55nqQARAQABiQREBBgBAgAPAhsCBQJYsb3rBQkIM/K8AinB -XSAEGQECAAYFAlRQBC8ACgkQ4gbCn78E/xc2jxAAsFu+jcO/pKvyixFilobPztif -tnk5NQ207eVA5rV6r/UV2ngBUn35YGpot1zltevXGs6hpS7jnvOtRgHYGjXxVEdG -/qFbqqHMOhjbNtQYLJBusPZI+L3hImiDCuipdy6d1uPGuXbiZ+jCyRj1FsLbA7HR -GHHFqkH6Yx7YM3FJV4VKzOw7pBrLM69fGu0WWFWqCf70ErreZudsF1EOjjpyUAMJ -O3ktKXUIRPNHSizAjgxDFW2hkkbILeBUbq6Qy5Qkt+K9tLrL08MloXSYiRnB/aIq -DF+mKc01292KkmUSy2AFX3xcrZDdwPZCmn9u2sbQ+yxek25cqbyG0qA9ihjrh/j1 -VILNs8kXUglI6qaj40aWeBlU+kCjedII2QNjWiye+0pbtrm512VUUaGm6xZHyE/5 -iy9Xyogi4L7r1xPxEG/n2dIQJUzkTpuy3ZDZot/eXYc6rMhDGrWXBk3Vy4j/feYo -MhaWazYZf9jOU6wCHoUHM8LhwE2rgEk65f01yIGoMba8e372N/3lPKl8LUoYJ36k -97HLtapSewPKe793e6jsOH3SGGVJRQJ3BhKfxo60xNTi31aQz0mdX4jaDiGQSXAK -wfjO8kEbFEunI06TcXCbBD/NMz6MnabC6CbCu76vF2vIFjXAnh7snFmmJL9/0FKP -nHAn1OV+RVPjQJxovtgJEDgEu4LTncDj8nYP/18SgUQ7yUTgc2DjwVOlrUFgL5TP -WtqjiRPaiUC5GwW/aFRKGyD0BcUaFFxJP2qhR5zMdmPrbZq9jTzPqPbDfq7Pin75 -pRLg0LIPjDWuygqhXIRECxSBsl5OA+zPsyoZEos0sZZI88OFAQR3jXwWANA6hlLY -oXohND92bk8s7BcQr9XJqghk93X0TX2HMJxExLKfp1jFF6gFEWpeqx91DIhQyKLS -txOeFCPsf8dUccg7QrgHZ60wE8W9jbDQW7kwhOlQ27ClvKKW1H/ZQTg3eFFc4IuI -86tAAb+AJNlr7CGyf5sQfzqMdPxy9ywvg3Kk9VEK7Y1mHGVcsvqAlfyOgOMJc0fZ -2U/1tDEKjk18KNxGsiIRrrwdYT9irwE0hmgWc3o4lxV6zFNJ1pxcmKkRhCMthNa3 -1KCKBiZDhZMQY5fSmUmNAFEsV92Z1o29BF3rK5FmH4FLueO+39aAoZiZO3W2jtrS -elzq6ol5XlAOB7Ol7o6p+9M1gVx4OgYaR5k/9jDgeI47MMW81rBSxG0FQeRu0zlB -2/o12Wf5RAz/laXISIUekapwlU5FYMjoP+ziAFZMN9QAbo0MLCuvj8FqX/B7NpeB -B+VNeou2GdK5+DPbn2sHWp1rtayNVipqMhWlEyrmsFHvkDFDcGYRSKbuSCd7O+PK -ZpCkfwcZAXF25edquQENBFY3Xw0BCADsNcfIEJ23NJ9GmIyotqT6MUggt2CLTAON -/ats4TeI4et851NdVI1GBMVChcmNhN36wY0OS2J+lSfozyDqksgRojMFs3Bjvn4x -EdvS7UU6UdX3TTSiy2RamLdjJjd9QA9JznOXxY/q0kIW6A9gG58D/tKt43AdQdgl -Q5XEMG5JY11rS9bNIrDk+QsNv8bUcN6ElFTWzOXMdFyqm0Im6ZWcxhlSdgbJG2HE -86L/DemLdNwOXetL4V2csWz+ZTY6+S6jbk2T2gSqUSel52voVU60k/HxMckYUBOa -UsAxPY0R1/XV3nRfhZQVfGSfMpzvrggi5Whz1uZ8fVmyTrK5H3dfABEBAAGJAh8E -GAECAAkFAlY3Xw0CGwwACgkQOAS7gtOdwOMgJg/9F2B+yY0bHwja0LHJ6+WhQYyR -dSmis5JlAL49EPEGFCptA5mECgUF48F84ZU4tlVs9sbzmKH8U9BVPU4EECHgf1Hf -trX+EoXf8n5BejdvKygFyzevoA2IEqH3u8WkDrOLXoNXDI2CcT4Uu25cQGJB6lvV -r8ohUZ2Q3krZzugCZtDhSclG56/rk+2MhApT3yeOcs2ED1htvdnU7OIeAxwP8Rcu -0f8kWUoGvJ3KlbmA6DoMrvlVRheJsKDLXcUV6XGKd2o5CDuKuNbPx5MIg4i5FwcA -R8gbNGsNVOX29g57YWZnXj7rKF0Ab2Vmx9Ir/y0qoRoSfLgH7no6io2Wx30i8mfq -2qd/6RwHi4/KimJJs9Xle9BQWb0kGU2FCnzmc8gAXoiGdzUTdvRxtHa2l8HOPlI7 -8z0cklwWr1cdnUXU87zJisqGFKvbyTNBEJmItXswDEuQcbzIsIMyDM5REdesH1Op -SJBc/A095yy/JuT7618R4T6BaWDD0oEvBtCds36Vd2jwtTRBb5cXvcfMc1Rfo5lN -afpO//HcKgJ/Oa4zAmKaXURzi+rBrxO+CGVpXQex+4+cohxxZ6gTbgNxYmGA7v55 -6HDxJBUyytvlzGiKqg97GKsHiISy4o5BLQPYFMpCNgB3rcb5RR0v5tGeeuhraXOo -2lPgP440izPGh5s38Oc= -=8riE ------END PGP PUBLIC KEY BLOCK----- diff --git a/.ci-builders/debian-base/rvm/gpg-keys/pkuczynski.asc b/.ci-builders/debian-base/rvm/gpg-keys/pkuczynski.asc deleted file mode 100644 index e5c71748a8701e..00000000000000 --- a/.ci-builders/debian-base/rvm/gpg-keys/pkuczynski.asc +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -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 -iWTuv7mXY0bNG+s= -=X3ZS ------END PGP PUBLIC KEY BLOCK----- diff --git a/.ci-builders/debian-rpmpublisher/Dockerfile b/.ci-builders/debian-rpmpublisher/Dockerfile index 88b2120a32f2b7..7f15d2ff7d273e 100644 --- a/.ci-builders/debian-rpmpublisher/Dockerfile +++ b/.ci-builders/debian-rpmpublisher/Dockerfile @@ -1,6 +1,6 @@ FROM docker.io/python:3.10.4-slim-buster -RUN pip install boto3 sts-rpm-s3==0.3.3 invoke distro==1.4.0 awscli==1.16 +RUN pip install boto3==1.22.7 sts-rpm-s3==0.3.3 invoke==1.7.0 distro==1.4.0 awscli==1.16 RUN apt update && apt-get install -y libkrb5-dev unixodbc-dev rpm python-deltarpm createrepo yum-utils gnupg2 ADD rpmmacros /root/.rpmmacros diff --git a/.ci-builders/debian/Dockerfile b/.ci-builders/debian/Dockerfile index d7690bde7c8ee5..ac5e55d7603c19 100644 --- a/.ci-builders/debian/Dockerfile +++ b/.ci-builders/debian/Dockerfile @@ -10,7 +10,6 @@ RUN echo 'gem: --no-document' >> /root/.gemrc RUN bash -c "source /usr/local/rvm/scripts/rvm && gem install deb-s3" -#RUN pip install awscli boto3 sts-rpm-s3 ADD rpmmacros /root/.rpmmacros # yum-utils #https://pkgs.org/download/yum-utils #RUN apt-get install -y libkrb5-dev unixodbc-dev rpm python-deltarpm createrepo bison yum-utils diff --git a/.ci-builders/runner-circle-deb/Dockerfile b/.ci-builders/runner-circle-deb/Dockerfile index d5f0d05a38a1d0..f5d53e71be4ebd 100644 --- a/.ci-builders/runner-circle-deb/Dockerfile +++ b/.ci-builders/runner-circle-deb/Dockerfile @@ -94,5 +94,5 @@ RUN apt-get install -y apt-utils libtool && apt-get install -y --only-upgrade li # For some tests RUN apt-get install sudo -RUN pip install awscli boto3 sts-rpm-s3 +RUN pip install awscli==1.16 boto3==1.22.7 sts-rpm-s3==0.3.3 RUN apt-get install -y libkrb5-dev unixodbc-dev rpm python-deltarpm createrepo yum-utils bison diff --git a/.ci-builders/runner-circle-rpm/Dockerfile b/.ci-builders/runner-circle-rpm/Dockerfile index 96a6bb3c192c80..4293086ac11eaa 100644 --- a/.ci-builders/runner-circle-rpm/Dockerfile +++ b/.ci-builders/runner-circle-rpm/Dockerfile @@ -91,6 +91,6 @@ RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ RUN git config --global user.email "gitlab@stackstate" && git config --global user.name "Gitlab Stackstate" -RUN pip install awscli boto3 sts-rpm-s3 +RUN pip install awscli==1.16 boto3==1.22.7 sts-rpm-s3==0.3.3 RUN yum -y install net-snmp-devel python-deltarpm yum-utils libtool rpm-sign createrepo diff --git a/.ci-builders/runner-gitlab-deb/Dockerfile b/.ci-builders/runner-gitlab-deb/Dockerfile index d5d3db73b38543..548e4a8e823d3d 100644 --- a/.ci-builders/runner-gitlab-deb/Dockerfile +++ b/.ci-builders/runner-gitlab-deb/Dockerfile @@ -1,6 +1,6 @@ FROM docker.io/stackstate/stackstate-agent-runner-gitlab:latest -RUN pip install awscli boto3 sts-rpm-s3 +RUN pip install awscli==1.16 boto3==1.22.7 sts-rpm-s3==0.3.3 #RUN apt-get install -y libkrb5-dev unixodbc-dev rpm python-deltarpm createrepo yum-utils ADD rpmmacros /root/.rpmmacros diff --git a/.ci-builders/runner-gitlab-rpm/Dockerfile b/.ci-builders/runner-gitlab-rpm/Dockerfile index b373c1fa554498..2e840e6eed94c3 100644 --- a/.ci-builders/runner-gitlab-rpm/Dockerfile +++ b/.ci-builders/runner-gitlab-rpm/Dockerfile @@ -1,6 +1,6 @@ FROM docker.io/stackstate/stackstate-agent-runner-gitlab:centos6 -RUN pip install awscli boto3 sts-rpm-s3 +RUN pip install awscli==1.16 boto3==1.22.7 sts-rpm-s3==0.3.3 RUN yum -y install net-snmp-devel python-deltarpm yum-utils libtool rpm-sign createrepo diff --git a/.ci-builders/runner7-gitlab-rpm/Dockerfile b/.ci-builders/runner7-gitlab-rpm/Dockerfile index 9340096d6866c8..c30e6b2b28bc97 100644 --- a/.ci-builders/runner7-gitlab-rpm/Dockerfile +++ b/.ci-builders/runner7-gitlab-rpm/Dockerfile @@ -32,7 +32,7 @@ RUN curl https://curl.se/ca/cacert.pem -o /etc/pki/tls/certs/ca-bundle.crt # /workaround -RUN pip install awscli boto3 sts-rpm-s3 +RUN pip install awscli==1.16 boto3==1.22.7 sts-rpm-s3==0.3.3 RUN yum -y install net-snmp-devel python-deltarpm yum-utils libtool rpm-sign createrepo From 01ae6552003540a7a2c263f1479f2cd29cf69fdc Mon Sep 17 00:00:00 2001 From: Juliano Krieger Date: Fri, 6 May 2022 14:49:13 +0200 Subject: [PATCH 81/81] STAC-16520 Downgrade boto3 to be compatible with awscli 1.16 --- .ci-builders/centos7-base/Dockerfile | 2 +- .ci-builders/debian-rpmpublisher/Dockerfile | 2 +- .ci-builders/runner-circle-deb/Dockerfile | 2 +- .ci-builders/runner-circle-rpm/Dockerfile | 2 +- .ci-builders/runner-gitlab-deb/Dockerfile | 2 +- .ci-builders/runner-gitlab-rpm/Dockerfile | 2 +- .ci-builders/runner7-gitlab-rpm/Dockerfile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.ci-builders/centos7-base/Dockerfile b/.ci-builders/centos7-base/Dockerfile index e5aed18d1f2668..2ed7729f0255b8 100644 --- a/.ci-builders/centos7-base/Dockerfile +++ b/.ci-builders/centos7-base/Dockerfile @@ -157,7 +157,7 @@ RUN mkdir -p /go/src/github.com/DataDog/datadog-agent # Force umask to 0022 RUN echo "umask 0022" >> /root/.bashrc -RUN pip install awscli==1.16 boto3==1.22.7 sts-rpm-s3==0.3.3 +RUN pip install awscli==1.16 boto3==1.8.0 sts-rpm-s3==0.3.3 RUN yum -y install net-snmp-devel python-deltarpm yum-utils libtool rpm-sign createrepo diff --git a/.ci-builders/debian-rpmpublisher/Dockerfile b/.ci-builders/debian-rpmpublisher/Dockerfile index 7f15d2ff7d273e..e29f0cdd670f97 100644 --- a/.ci-builders/debian-rpmpublisher/Dockerfile +++ b/.ci-builders/debian-rpmpublisher/Dockerfile @@ -1,6 +1,6 @@ FROM docker.io/python:3.10.4-slim-buster -RUN pip install boto3==1.22.7 sts-rpm-s3==0.3.3 invoke==1.7.0 distro==1.4.0 awscli==1.16 +RUN pip install boto3==1.8.0 sts-rpm-s3==0.3.3 invoke==1.7.0 distro==1.4.0 awscli==1.16 RUN apt update && apt-get install -y libkrb5-dev unixodbc-dev rpm python-deltarpm createrepo yum-utils gnupg2 ADD rpmmacros /root/.rpmmacros diff --git a/.ci-builders/runner-circle-deb/Dockerfile b/.ci-builders/runner-circle-deb/Dockerfile index f5d53e71be4ebd..767a8d93298d2a 100644 --- a/.ci-builders/runner-circle-deb/Dockerfile +++ b/.ci-builders/runner-circle-deb/Dockerfile @@ -94,5 +94,5 @@ RUN apt-get install -y apt-utils libtool && apt-get install -y --only-upgrade li # For some tests RUN apt-get install sudo -RUN pip install awscli==1.16 boto3==1.22.7 sts-rpm-s3==0.3.3 +RUN pip install awscli==1.16 boto3==1.8.0 sts-rpm-s3==0.3.3 RUN apt-get install -y libkrb5-dev unixodbc-dev rpm python-deltarpm createrepo yum-utils bison diff --git a/.ci-builders/runner-circle-rpm/Dockerfile b/.ci-builders/runner-circle-rpm/Dockerfile index 4293086ac11eaa..df691415d67411 100644 --- a/.ci-builders/runner-circle-rpm/Dockerfile +++ b/.ci-builders/runner-circle-rpm/Dockerfile @@ -91,6 +91,6 @@ RUN mkdir -p "$GEM_HOME" "$BUNDLE_BIN" \ RUN git config --global user.email "gitlab@stackstate" && git config --global user.name "Gitlab Stackstate" -RUN pip install awscli==1.16 boto3==1.22.7 sts-rpm-s3==0.3.3 +RUN pip install awscli==1.16 boto3==1.8.0 sts-rpm-s3==0.3.3 RUN yum -y install net-snmp-devel python-deltarpm yum-utils libtool rpm-sign createrepo diff --git a/.ci-builders/runner-gitlab-deb/Dockerfile b/.ci-builders/runner-gitlab-deb/Dockerfile index 548e4a8e823d3d..69494aa1bf84b5 100644 --- a/.ci-builders/runner-gitlab-deb/Dockerfile +++ b/.ci-builders/runner-gitlab-deb/Dockerfile @@ -1,6 +1,6 @@ FROM docker.io/stackstate/stackstate-agent-runner-gitlab:latest -RUN pip install awscli==1.16 boto3==1.22.7 sts-rpm-s3==0.3.3 +RUN pip install awscli==1.16 boto3==1.8.0 sts-rpm-s3==0.3.3 #RUN apt-get install -y libkrb5-dev unixodbc-dev rpm python-deltarpm createrepo yum-utils ADD rpmmacros /root/.rpmmacros diff --git a/.ci-builders/runner-gitlab-rpm/Dockerfile b/.ci-builders/runner-gitlab-rpm/Dockerfile index 2e840e6eed94c3..77b7b91cd2fca3 100644 --- a/.ci-builders/runner-gitlab-rpm/Dockerfile +++ b/.ci-builders/runner-gitlab-rpm/Dockerfile @@ -1,6 +1,6 @@ FROM docker.io/stackstate/stackstate-agent-runner-gitlab:centos6 -RUN pip install awscli==1.16 boto3==1.22.7 sts-rpm-s3==0.3.3 +RUN pip install awscli==1.16 boto3==1.8.0 sts-rpm-s3==0.3.3 RUN yum -y install net-snmp-devel python-deltarpm yum-utils libtool rpm-sign createrepo diff --git a/.ci-builders/runner7-gitlab-rpm/Dockerfile b/.ci-builders/runner7-gitlab-rpm/Dockerfile index c30e6b2b28bc97..93eaf359310216 100644 --- a/.ci-builders/runner7-gitlab-rpm/Dockerfile +++ b/.ci-builders/runner7-gitlab-rpm/Dockerfile @@ -32,7 +32,7 @@ RUN curl https://curl.se/ca/cacert.pem -o /etc/pki/tls/certs/ca-bundle.crt # /workaround -RUN pip install awscli==1.16 boto3==1.22.7 sts-rpm-s3==0.3.3 +RUN pip install awscli==1.16 boto3==1.8.0 sts-rpm-s3==0.3.3 RUN yum -y install net-snmp-devel python-deltarpm yum-utils libtool rpm-sign createrepo