From e5418dda9043d5916e052d2424e4939107e8beea Mon Sep 17 00:00:00 2001 From: murphp15 Date: Mon, 23 Jan 2023 14:04:44 +0000 Subject: [PATCH 1/4] control-service: use latest docker image Signed-off-by: murphp15 --- projects/control-service/cicd/.gitlab-ci.yml | 38 ++++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/projects/control-service/cicd/.gitlab-ci.yml b/projects/control-service/cicd/.gitlab-ci.yml index f4e9727361..e094ec3c7b 100644 --- a/projects/control-service/cicd/.gitlab-ci.yml +++ b/projects/control-service/cicd/.gitlab-ci.yml @@ -22,24 +22,24 @@ - projects/control-service/projects/helm_charts/pipelines-control-service/**/* .control_service_base_build: - image: docker:19.03.15 + image: docker:20.10.22 variables: _JAVA_OPTIONS: "-Xms2048m -Xmx4096m" before_script: - - apk --no-cache add git zip openjdk11-jdk curl zip python3 py3-pip --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community - - pip3 install --upgrade pip && pip3 install awscli + - apk --no-cache add openjdk17-jdk git zip curl zip py-pip + - pip install --upgrade pip && pip install awscli control_service_build_image: extends: .control_service_base_build services: - - docker:19.03.15-dind + - docker:20.10.22-dind variables: DOCKER_HOST: tcp://localhost:2375 DOCKER_DRIVER: overlay2 DOCKER_TLS_CERTDIR: "" stage: build script: - - apk --no-cache add git openjdk11-jdk --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community + - apk --no-cache add git openjdk17-jdk - export TAG=$(git rev-parse --short HEAD) - cd projects/control-service/projects - ./gradlew -p ./model build publishToMavenLocal --info --stacktrace @@ -118,9 +118,9 @@ control_service_test_helm_chart: - projects/control-service/projects/helm_charts/pipelines-control-service/version.txt control_service_publish_job_base_image: - image: docker:19.03.15 + image: docker:20.10.22 services: - - docker:19.03.15-dind + - docker:20.10.22-dind variables: DOCKER_HOST: tcp://localhost:2375 DOCKER_DRIVER: overlay2 @@ -145,9 +145,9 @@ control_service_publish_job_base_image: control_service_publish_job_builder_image: - image: docker:19.03.15 + image: docker:20.10.22 services: - - docker:19.03.15-dind + - docker:20.10.22-dind variables: DOCKER_HOST: tcp://localhost:2375 DOCKER_DRIVER: overlay2 @@ -182,16 +182,16 @@ control_service_publish_job_builder_secure_image: control_service_publish_image: - image: docker:19.03.15 + image: docker:20.10.22 services: - - docker:19.03.15-dind + - docker:20.10.22-dind variables: DOCKER_HOST: tcp://localhost:2375 DOCKER_DRIVER: overlay2 DOCKER_TLS_CERTDIR: "" stage: publish_artifacts script: - - apk add --no-cache git openjdk11-jdk + - apk add --no-cache git openjdk17-jdk - export TAG=$(git rev-parse --short HEAD) - docker login -u $VDK_DOCKER_REGISTRY_USERNAME -p $VDK_DOCKER_REGISTRY_PASSWORD - cd projects/control-service/projects @@ -213,10 +213,10 @@ control_service_publish_image: changes: *control_service_helm_change_locations control_service_publish_api_client: - image: docker:19.03.15 + image: docker:20.10.22 stage: publish_artifacts script: - - apk add --no-cache py-pip openjdk11-jdk git python + - apk add --no-cache py-pip openjdk17-jdk git python - pip install -U pip setuptools wheel twine - ./projects/control-service/projects/gradlew -p ./projects/control-service/projects/model buildPython - cd projects/control-service/projects/model/apidefs/datajob-api/build @@ -240,8 +240,8 @@ control_service_deploy_testing_data_pipelines: stage: pre_release image: proum/aws-iam-authenticator script: - - apk --no-cache add bash openssl curl git gettext zip python3 py3-pip - - pip3 install --upgrade pip && pip3 install awscli + - apk --no-cache add bash openssl curl git gettext zip py-pip + - pip install --upgrade pip && pip install awscli - export DESIRED_VERSION=v3.6.3 # helm version 3.6.3 - curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash - bash -ex ./projects/control-service/cicd/deploy-testing-pipelines-service.sh @@ -278,7 +278,7 @@ control_service_post_deployment_test: changes: *control_service_helm_change_locations control_service_release: - image: docker:19.03.15 + image: docker:20.10.22 stage: release script: - apk --no-cache add bash openssl curl git @@ -300,9 +300,9 @@ control_service_release: # TODO: automatically rebuild image on vdk-heartbeat change control_service_vdk_heartbeat_release: - image: docker:19.03.15 + image: docker:20.10.22 services: - - docker:19.03.15-dind + - docker:20.10.22-dind variables: DOCKER_HOST: tcp://localhost:2375 DOCKER_DRIVER: overlay2 From 98b0cfef645ae92430b2f65c9306bc58922aa235 Mon Sep 17 00:00:00 2001 From: murphp15 Date: Mon, 23 Jan 2023 14:07:21 +0000 Subject: [PATCH 2/4] control-service: use latest docker image Signed-off-by: murphp15 --- projects/control-service/cicd/.gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/control-service/cicd/.gitlab-ci.yml b/projects/control-service/cicd/.gitlab-ci.yml index e094ec3c7b..c228425e56 100644 --- a/projects/control-service/cicd/.gitlab-ci.yml +++ b/projects/control-service/cicd/.gitlab-ci.yml @@ -26,7 +26,7 @@ variables: _JAVA_OPTIONS: "-Xms2048m -Xmx4096m" before_script: - - apk --no-cache add openjdk17-jdk git zip curl zip py-pip + - apk --no-cache add openjdk11-jdk git zip curl zip py-pip - pip install --upgrade pip && pip install awscli control_service_build_image: @@ -39,7 +39,7 @@ control_service_build_image: DOCKER_TLS_CERTDIR: "" stage: build script: - - apk --no-cache add git openjdk17-jdk + - apk --no-cache add git openjdk11-jdk - export TAG=$(git rev-parse --short HEAD) - cd projects/control-service/projects - ./gradlew -p ./model build publishToMavenLocal --info --stacktrace @@ -191,7 +191,7 @@ control_service_publish_image: DOCKER_TLS_CERTDIR: "" stage: publish_artifacts script: - - apk add --no-cache git openjdk17-jdk + - apk add --no-cache git openjdk11-jdk - export TAG=$(git rev-parse --short HEAD) - docker login -u $VDK_DOCKER_REGISTRY_USERNAME -p $VDK_DOCKER_REGISTRY_PASSWORD - cd projects/control-service/projects @@ -216,7 +216,7 @@ control_service_publish_api_client: image: docker:20.10.22 stage: publish_artifacts script: - - apk add --no-cache py-pip openjdk17-jdk git python + - apk add --no-cache py-pip openjdk11-jdk git python - pip install -U pip setuptools wheel twine - ./projects/control-service/projects/gradlew -p ./projects/control-service/projects/model buildPython - cd projects/control-service/projects/model/apidefs/datajob-api/build From 8b24ffcabd40d2776ab6cb0dce15f5c4ea1dfd34 Mon Sep 17 00:00:00 2001 From: murphp15 Date: Mon, 23 Jan 2023 15:29:35 +0000 Subject: [PATCH 3/4] control-service: use latest docker image Signed-off-by: murphp15 --- projects/control-service/cicd/.gitlab-ci.yml | 53 +++++++------------- 1 file changed, 17 insertions(+), 36 deletions(-) diff --git a/projects/control-service/cicd/.gitlab-ci.yml b/projects/control-service/cicd/.gitlab-ci.yml index c228425e56..86dd84ce68 100644 --- a/projects/control-service/cicd/.gitlab-ci.yml +++ b/projects/control-service/cicd/.gitlab-ci.yml @@ -4,6 +4,13 @@ when: - always +.images:dind: + image: docker:20.10.22 + variables: + DOCKER_HOST: tcp://localhost:2375 + DOCKER_DRIVER: overlay2 + services: + - docker:20.10.22-dind # This grouping listens on changes to all code of control service # Changes to this group should trigger runs of runs of unit and integration tests. @@ -30,13 +37,9 @@ - pip install --upgrade pip && pip install awscli control_service_build_image: - extends: .control_service_base_build - services: - - docker:20.10.22-dind - variables: - DOCKER_HOST: tcp://localhost:2375 - DOCKER_DRIVER: overlay2 - DOCKER_TLS_CERTDIR: "" + extends: + - .control_service_base_build + - images:dind stage: build script: - apk --no-cache add git openjdk11-jdk @@ -118,13 +121,7 @@ control_service_test_helm_chart: - projects/control-service/projects/helm_charts/pipelines-control-service/version.txt control_service_publish_job_base_image: - image: docker:20.10.22 - services: - - docker:20.10.22-dind - variables: - DOCKER_HOST: tcp://localhost:2375 - DOCKER_DRIVER: overlay2 - DOCKER_TLS_CERTDIR: "" + extends: images:dind stage: publish_artifacts script: - apk add --no-cache bash @@ -145,13 +142,7 @@ control_service_publish_job_base_image: control_service_publish_job_builder_image: - image: docker:20.10.22 - services: - - docker:20.10.22-dind - variables: - DOCKER_HOST: tcp://localhost:2375 - DOCKER_DRIVER: overlay2 - DOCKER_TLS_CERTDIR: "" + extends: images:dind stage: publish_artifacts script: - apk add --no-cache bash @@ -170,7 +161,9 @@ control_service_publish_job_builder_image: control_service_publish_job_builder_secure_image: - extends: control_service_publish_job_builder_image + extends: + - control_service_publish_job_builder_image + - images:dind script: - apk add --no-cache bash - docker login --username "${VDK_DOCKER_REGISTRY_USERNAME}" --password "${VDK_DOCKER_REGISTRY_PASSWORD}" "${VDK_DOCKER_REGISTRY_URL}" @@ -182,13 +175,7 @@ control_service_publish_job_builder_secure_image: control_service_publish_image: - image: docker:20.10.22 - services: - - docker:20.10.22-dind - variables: - DOCKER_HOST: tcp://localhost:2375 - DOCKER_DRIVER: overlay2 - DOCKER_TLS_CERTDIR: "" + extends: images:dind stage: publish_artifacts script: - apk add --no-cache git openjdk11-jdk @@ -300,13 +287,7 @@ control_service_release: # TODO: automatically rebuild image on vdk-heartbeat change control_service_vdk_heartbeat_release: - image: docker:20.10.22 - services: - - docker:20.10.22-dind - variables: - DOCKER_HOST: tcp://localhost:2375 - DOCKER_DRIVER: overlay2 - DOCKER_TLS_CERTDIR: "" + extends: images:dind stage: release script: - export CHART_NAME=pipelines-control-service From 5c059688de59c645c0029eed0ffb654c2d445cd4 Mon Sep 17 00:00:00 2001 From: murphp15 Date: Mon, 23 Jan 2023 15:33:50 +0000 Subject: [PATCH 4/4] control-service: use latest docker image Signed-off-by: murphp15 --- projects/control-service/cicd/.gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/projects/control-service/cicd/.gitlab-ci.yml b/projects/control-service/cicd/.gitlab-ci.yml index 86dd84ce68..ea9c0615be 100644 --- a/projects/control-service/cicd/.gitlab-ci.yml +++ b/projects/control-service/cicd/.gitlab-ci.yml @@ -39,7 +39,7 @@ control_service_build_image: extends: - .control_service_base_build - - images:dind + - .images:dind stage: build script: - apk --no-cache add git openjdk11-jdk @@ -121,7 +121,7 @@ control_service_test_helm_chart: - projects/control-service/projects/helm_charts/pipelines-control-service/version.txt control_service_publish_job_base_image: - extends: images:dind + extends: .images:dind stage: publish_artifacts script: - apk add --no-cache bash @@ -142,7 +142,7 @@ control_service_publish_job_base_image: control_service_publish_job_builder_image: - extends: images:dind + extends: .images:dind stage: publish_artifacts script: - apk add --no-cache bash @@ -163,7 +163,7 @@ control_service_publish_job_builder_image: control_service_publish_job_builder_secure_image: extends: - control_service_publish_job_builder_image - - images:dind + - .images:dind script: - apk add --no-cache bash - docker login --username "${VDK_DOCKER_REGISTRY_USERNAME}" --password "${VDK_DOCKER_REGISTRY_PASSWORD}" "${VDK_DOCKER_REGISTRY_URL}" @@ -175,7 +175,7 @@ control_service_publish_job_builder_secure_image: control_service_publish_image: - extends: images:dind + extends: .images:dind stage: publish_artifacts script: - apk add --no-cache git openjdk11-jdk @@ -287,7 +287,7 @@ control_service_release: # TODO: automatically rebuild image on vdk-heartbeat change control_service_vdk_heartbeat_release: - extends: images:dind + extends: .images:dind stage: release script: - export CHART_NAME=pipelines-control-service